Properly include the hosted URL in all IDs.

lib/src/source/hosted.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.
 
 import 'dart:async';
 import 'dart:io' as io;
 import "dart:convert";
 
 import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as path;
@@ skipping 62 matching lines @@
     } catch (error, stackTrace) {
       var parsed = _parseDescription(ref.description);
       _throwFriendlyError(error, stackTrace, parsed.first, parsed.last);
     }
 
     var doc = JSON.decode(body);
     return doc['versions'].map((map) {
       var pubspec = new Pubspec.fromMap(
           map['pubspec'], systemCache.sources,
           expectedName: ref.name, location: url);
-      var id = idFor(ref.name, pubspec.version);
+      var id = idFor(ref.name, pubspec.version,
+          url: _serverFor(ref.description));
       memoizePubspec(id, pubspec);
 
       return id;
     }).toList();
   }
 
   /// Downloads and parses the pubspec for a specific version of a package that
   /// is available from the site.
   Future<Pubspec> describeUncached(PackageId id) async {
     // Request it from the server.
@@ skipping 65 matching lines @@
 
     var successes = [];
     var failures = [];
 
     for (var serverDir in listDir(systemCacheRoot)) {
       var url = _directoryToUrl(path.basename(serverDir));
       var packages = _getCachedPackagesInDirectory(path.basename(serverDir));
       packages.sort(Package.orderByNameAndVersion);
 
       for (var package in packages) {
-        var id = idFor(package.name, package.version);
+        var id = idFor(package.name, package.version, url: url);
 
         try {
           await _download(url, package.name, package.version, package.dir);
           successes.add(id);
         } catch (error, stackTrace) {
           failures.add(id);
           var message = "Failed to repair ${log.bold(package.name)} "
               "${package.version}";
           if (url != defaultUrl) message += " from $url";
           log.error("$message. Error:\n$error");
@@ skipping 82 matching lines @@
     log.io("Finding versions of ${ref.name} in "
         "$systemCacheRoot/${_urlToDirectory(server)}");
 
     var dir = path.join(systemCacheRoot, _urlToDirectory(server));
 
     var versions;
     if (dirExists(dir)) {
       versions = await listDir(dir).map((entry) {
         var components = path.basename(entry).split("-");
         if (components.first != ref.name) return null;
-        return HostedSource.idFor(ref.name, new Version.parse(components.last));
+        return HostedSource.idFor(
+            ref.name, new Version.parse(components.last),
+            url: _serverFor(ref.description));
       }).where((id) => id != null).toList();
     } else {
       versions = [];
     }
 
     // If there are no versions in the cache, report a clearer error.
     if (versions.isEmpty) {
       throw new PackageNotFoundException(
           "Could not find package ${ref.name} in cache.");
     }
@@ skipping 62 matching lines @@
 /// converts that to a Uri given [pattern].
 ///
 /// Ensures the package name is properly URL encoded.
 Uri _makeUrl(description, String pattern(String server, String package)) {
   var parsed = _parseDescription(description);
   var server = parsed.last;
   var package = Uri.encodeComponent(parsed.first);
   return Uri.parse(pattern(server, package));
 }
 
+/// Returns the server URL for [description].
+Uri _serverFor(description) => Uri.parse(_parseDescription(description).last);
+
 /// Parses [id] into its server, package name, and version components, then
 /// converts that to a Uri given [pattern].
 ///
 /// Ensures the package name is properly URL encoded.
 Uri _makeVersionUrl(PackageId id,
     String pattern(String server, String package, String version)) {
   var parsed = _parseDescription(id.description);
   var server = parsed.last;
   var package = Uri.encodeComponent(parsed.first);
   var version = Uri.encodeComponent(id.version.toString());
@@ skipping 22 matching lines @@
   var name = description["name"];
   if (name is! String) {
     throw new FormatException("The 'name' key must have a string value.");
   }
 
   var url = description["url"];
   if (url == null) url = HostedSource.defaultUrl;
 
   return new Pair<String, String>(name, url);
 }