--- old-trunk/setuptools-0.6c16dev2.egg/pkg_resources.py	2010-10-15 00:49:18.000000000 -0600
+++ new-trunk/setuptools-0.6c16dev2.egg/pkg_resources.py	2010-10-15 00:49:18.000000000 -0600
@@ -2603,10 +2603,13 @@
         working_set.require(__requires__)
     except VersionConflict:     # try it without defaults already on sys.path
         working_set = WorkingSet([])    # by starting with an empty path
-        for dist in working_set.resolve(
-            parse_requirements(__requires__), Environment()
-        ):
-            working_set.add(dist)
+        try:
+            for dist in working_set.resolve(
+                parse_requirements(__requires__), Environment()
+                ):
+                working_set.add(dist)
+        except DistributionNotFound:
+            pass
         for entry in sys.path:  # add any missing entries from sys.path
             if entry not in working_set.entries:
                 working_set.add_entry(entry)
