details: http://www.bx.psu.edu/hg/galaxy/rev/597f813860c1 changeset: 2904:597f813860c1 user: Nate Coraor nate@bx.psu.edu date: Wed Oct 21 15:03:09 2009 -0400 description: Don't unpack dist-eggs

2 file(s) affected in this change:

lib/galaxy/eggs/__init__.py scripts/dist-scramble.py

diffs (34 lines):

diff -r fd5943ff7b40 -r 597f813860c1 lib/galaxy/eggs/__init__.py --- a/lib/galaxy/eggs/__init__.py Tue Oct 20 13:08:29 2009 -0400 +++ b/lib/galaxy/eggs/__init__.py Wed Oct 21 15:03:09 2009 -0400 @@ -112,7 +112,7 @@ unpack_zipfile( self.path, self.path + "-tmp" ) os.remove( self.path ) os.rename( self.path + "-tmp", self.path ) - def scramble( self ): + def scramble( self, dist=False ): if self.path is None: self.find() if os.access( self.path, os.F_OK ): @@ -148,7 +148,8 @@ shutil.copyfile( new_egg, self.path ) log.warning( "scramble(): Copied egg to:" ) log.warning( " %s" % self.path ) - self.unpack_if_needed() + if not dist: + self.unpack_if_needed() for doppelganger in self.doppelgangers: remove_file_or_path( doppelganger ) log.warning( "Removed conflicting egg: %s" % doppelganger ) diff -r fd5943ff7b40 -r 597f813860c1 scripts/dist-scramble.py --- a/scripts/dist-scramble.py Tue Oct 20 13:08:29 2009 -0400 +++ b/scripts/dist-scramble.py Wed Oct 21 15:03:09 2009 -0400 @@ -31,7 +31,7 @@ sys.exit( 1 ) failed = [] for egg in egg_list: - if not egg.scramble(): + if not egg.scramble( dist=True ): failed.append( egg.platform['galaxy'] ) if len( failed ): print ""