1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/01cb4107bb2d/ changeset: r5371:01cb4107bb2d user: kanwei date: 2011-04-13 04:08:09 summary: Fix some scramble problems affected #: 3 files (46 bytes) --- a/lib/galaxy/eggs/__init__.py Tue Apr 12 17:26:06 2011 -0400 +++ b/lib/galaxy/eggs/__init__.py Tue Apr 12 22:08:09 2011 -0400 @@ -219,7 +219,7 @@ 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 --- a/lib/galaxy/eggs/dist.py Tue Apr 12 17:26:06 2011 -0400 +++ b/lib/galaxy/eggs/dist.py Tue Apr 12 22:08:09 2011 -0400 @@ -84,7 +84,7 @@ 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 --- a/scripts/dist-scramble.py Tue Apr 12 17:26:06 2011 -0400 +++ b/scripts/dist-scramble.py Tue Apr 12 22:08:09 2011 -0400 @@ -15,6 +15,7 @@ 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__ Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.