mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Fix some scramble problems
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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__
|
||||
|
||||
Reference in New Issue
Block a user