From 962f7d06ba340a6b64fcf54cd1a406ea86f2678d Mon Sep 17 00:00:00 2001 From: Kanwei Li Date: Tue, 12 Apr 2011 22:08:09 -0400 Subject: [PATCH] Fix some scramble problems --- lib/galaxy/eggs/__init__.py | 2 +- lib/galaxy/eggs/dist.py | 2 +- scripts/dist-scramble.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/eggs/__init__.py b/lib/galaxy/eggs/__init__.py index a6937d8cf7c..01402dde8fb 100644 --- a/lib/galaxy/eggs/__init__.py +++ b/lib/galaxy/eggs/__init__.py @@ -219,7 +219,7 @@ class Egg( object ): pkg_resources.working_set.entry_keys[entry] = [] if entry in sys.path: sys.path.remove(entry) - # if the conflict is a dpeendent egg, fetch that specific egg + # if the conflict is a dependent egg, fetch that specific egg if egg: # Store the removed path so the fetch method can use it egg.removed_location = location diff --git a/lib/galaxy/eggs/dist.py b/lib/galaxy/eggs/dist.py index ebbc368049e..70947d7aae5 100644 --- a/lib/galaxy/eggs/dist.py +++ b/lib/galaxy/eggs/dist.py @@ -84,7 +84,7 @@ class DistScrambleCrate( ScrambleCrate ): for platform in platforms: if name in self.ignore and platform in self.ignore[name].split(): continue - egg = DistScrambleEgg( name, version, tag, url, platform ) + egg = DistScrambleEgg( name, version, tag, url, platform, self ) host_info = self.hosts[platform].split() egg.build_host, egg.python = host_info[:2] egg.sources = sources diff --git a/scripts/dist-scramble.py b/scripts/dist-scramble.py index 677c81775f7..0f5c13475bf 100644 --- a/scripts/dist-scramble.py +++ b/scripts/dist-scramble.py @@ -15,6 +15,7 @@ lib = os.path.abspath( os.path.join( os.path.dirname( __file__ ), '..', 'lib' ) sys.path.append( lib ) from galaxy.eggs.dist import DistScrambleCrate, ScrambleFailure +from galaxy.eggs import EggNotFetchable if len( sys.argv ) > 3 or len( sys.argv ) < 2: print __doc__