Fix issue 7215 by relativising a path before checking its components.

utils/pub/command_lish.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library command_lish;
 
 import 'dart:io';
 import 'dart:json';
 import 'dart:uri';
 
 import '../../pkg/args/lib/args.dart';
 import '../../pkg/http/lib/http.dart' as http;
 import 'git.dart' as git;
 import 'io.dart';
 import 'log.dart' as log;
 import 'oauth2.dart' as oauth2;
 import 'pub.dart';
 import 'validator.dart';
 
-// TODO(nweiz): Make "publish" the primary name for this command. See issue
-// 6949.
 /// Handles the `lish` and `publish` pub commands.
 class LishCommand extends PubCommand {
   final description = "Publish the current package to pub.dartlang.org.";
   final usage = "pub publish [options]";
   final aliases = const ["lish", "lush"];
 
   ArgParser get commandParser {
     var parser = new ArgParser();
     parser.addOption('server', defaultsTo: 'https://pub.dartlang.org',
         help: 'The package server to which to upload this package');
@@ skipping 105 matching lines @@
 
       return listDir(rootDir, recursive: true).chain((entries) {
         return Futures.wait(entries.map((entry) {
           return fileExists(entry).transform((isFile) => isFile ? entry : null);
         }));
       });
     }).transform((files) => files.filter((file) {
       if (file == null || _BLACKLISTED_FILES.contains(basename(file))) {
         return false;
       }
-      // TODO(nweiz): Since `file` is absolute, this will break if the package
-      // itself is in a directory named "packages" (issue 7215).
-      return !splitPath(file).some(_BLACKLISTED_DIRECTORIES.contains);
+      return !splitPath(relativeTo(file, rootDir))
+          .some(_BLACKLISTED_DIRECTORIES.contains);
     }));
   }
 
   /// Parses a response body, assuming it's JSON-formatted. Throws a
   /// user-friendly error if the response body is invalid JSON, or if it's not a
   /// map.
   Map _parseJson(http.Response response) {
     var value;
     try {
       value = JSON.parse(response.body);
@@ skipping 29 matching lines @@
       var s = warnings.length == 1 ? '' : 's';
       stdout.writeString("Package has ${warnings.length} warning$s. Upload "
           "anyway (y/n)? ");
       return readLine().transform((line) {
         if (new RegExp(r"^[yY]").hasMatch(line)) return;
         throw "Package upload canceled.";
       });
     });
   }
 }