"Reverting 13451"

utils/pub/pub.dart

Index: utils/pub/pub.dart
diff --git a/utils/pub/pub.dart b/utils/pub/pub.dart
index e3598bb3dd6f96116ed175ab59ed96f4a175fe3a..e85b60efc7c621468b2b5171741de9ffd7c0b69b 100644
--- a/utils/pub/pub.dart
+++ b/utils/pub/pub.dart
@@ -204,7 +204,7 @@ abstract class PubCommand {
       // TODO(rnystrom): Will eventually need better logic to walk up
       // subdirectories until we hit one that looks package-like. For now, just
       // assume the cwd is it.
-      future = Package.load(null, currentWorkingDir, cache.sources)
+      future = Package.load(null, workingDir, cache.sources)
           .transform((package) => new Entrypoint(package, cache));
     }
 
@@ -224,10 +224,10 @@ abstract class PubCommand {
     future.handleException((e) {
       if (e is PubspecNotFoundException && e.name == null) {
         e = 'Could not find a file named "pubspec.yaml" in the directory '
-          'currentWorkingDir.';
+          '$workingDir.';
       } else if (e is PubspecHasNoNameException && e.name == null) {
         e = 'pubspec.yaml is missing the required "name" field (e.g. "name: '
-          '${basename(currentWorkingDir)}").';
+          '${basename(workingDir)}").';
       }
 
       handleError(e, future.stackTrace);