Copying pristine 50 done, 16 queued. __init__.py Copying pristine 76 done, 26 queued. helper.rst Copying pristine 126 done, 17 queued. Makefile Copying pristine 221 done, 26 queued. tahoe_disktotal Copying pristine 278 done, 22 queued. install_egg_info.py Copying pristine 343 done, 31 queued. checker.py Copying pristine 372 done, 23 queued. common.py Copying pristine 400 done, 19 queued. tahoe_get.py Copying pristine 422 done, 56 queued. bench_dirnode.py Copying pristine 446 done, 32 queued. test_hashtree.py Copying pristine 483 done, 27 queued. encodingutil.py Copying pristine 511 done, 36 queued. common.py Copying pristine 533 done, 14 queued. root.py Copying pristine 548 done, 2 queued. registry.py Reading pristine 69 done, 471 queued. accfe419cf8e0316dabc02f7c660bcca6127a3c061 diff -rN -u old-trunk/setuptools-0.6c16dev2.egg/pkg_resources.py new-trunk/setuptools-0.6c16dev2.egg/pkg_resources.py --- old-trunk/setuptools-0.6c16dev2.egg/pkg_resources.py 2010-11-03 14:23:46.000000000 -0600 +++ new-trunk/setuptools-0.6c16dev2.egg/pkg_resources.py 2010-11-03 14:24:01.000000000 -0600 @@ -808,18 +808,24 @@ """ dist = working_set.find(req) if dist is not None: + print "yyy 0 ", req, dist return dist # first try to find a platform-dependent dist for dist in self[req.key]: + print "yyy 1 ", req, dist if dist in req and dist.platform is not None: + print "yyy 2 ", req, dist return dist # then try any other dist for dist in self[req.key]: + print "yyy 3 ", req, dist if dist in req: + print "yyy 4 ", req, dist return dist + print "yyy 5 ", req, dist return self.obtain(req, installer) # try and download/install def obtain(self, requirement, installer=None): @@ -2625,7 +2631,8 @@ else: # Yes: ensure the requirements are met, by prefixing sys.path if necessary try: - working_set.require(__requires__) + if __requires__: + working_set.require(__requires__) except (VersionConflict, DistributionNotFound): # try it without defaults already on sys.path working_set = WorkingSet([]) # by starting with an empty path try: diff -rN -u old-trunk/setuptools-0.6c16dev2.egg/setuptools/package_index.py new-trunk/setuptools-0.6c16dev2.egg/setuptools/package_index.py --- old-trunk/setuptools-0.6c16dev2.egg/setuptools/package_index.py 2010-11-03 14:23:47.000000000 -0600 +++ new-trunk/setuptools-0.6c16dev2.egg/setuptools/package_index.py 2010-11-03 14:24:01.000000000 -0600 @@ -216,7 +216,7 @@ dists = distros_for_filename(fn) if dists: - self.debug("Found: %s", fn) + self.debug("Found: %s zzz 0 %s(%s)", fn, self.add, dists) map(self.add, dists) def url_ok(self, url, fatal=False): @@ -437,41 +437,51 @@ # Find a matching distribution; may be called more than once for dist in env[req.key]: + print "aaa 0", dist if dist.precedence==DEVELOP_DIST and not develop_ok: + print "aaa 1 ", dist if dist not in skipped: + print "aaa 2", dist self.warn("Skipping development or system egg: %s",dist) skipped[dist] = 1 continue if dist in req and (dist.precedence<=SOURCE_DIST or not source): + print "aaa 3", dist return dist if force_scan: + print "aaa 4", dist self.prescan() self.find_packages(requirement) dist = find(self, requirement) if local_index is not None: + print "aaa 5", dist dist = dist or find(local_index, requirement) if dist is None and self.to_scan is not None: + print "aaa 6", dist self.prescan() dist = find(self, requirement) if dist is None and not force_scan: + print "aaa 7", dist self.find_packages(requirement) dist = find(self, requirement) if dist is None: + print "aaa 8", dist self.warn( "No local packages or download links found for %s%s", (source and "a source distribution of " or ""), requirement, ) else: + print "aaa 9", dist self.info("Best match: %s", dist) return dist.clone(location=self.download(dist.location, tmpdir))