1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/559a9ad2844d/ changeset: r5038:559a9ad2844d user: natefoo date: 2011-02-10 18:13:55 summary: Fix for pysam egg conditional, which would always fail, and actually check always_conditional eggs in the crate's all_eggs method. Fixes downloading of eggs for offline systems. affected #: 1 file (82 bytes) --- a/lib/galaxy/eggs/__init__.py Thu Feb 10 10:33:08 2011 -0500 +++ b/lib/galaxy/eggs/__init__.py Thu Feb 10 12:13:55 2011 -0500 @@ -295,8 +295,9 @@ """ rval = [] for egg in self.eggs.values(): - if egg.name not in self.galaxy_config.always_conditional: - rval.append( egg ) + if egg.name in self.galaxy_config.always_conditional and not self.galaxy_config.check_conditional( egg.name ): + continue + rval.append( egg ) return rval def __getitem__( self, name ): """ @@ -357,7 +358,7 @@ "python_daemon": lambda: sys.version_info[:2] >= ( 2, 5 ), "GeneTrack": lambda: sys.version_info[:2] >= ( 2, 5 ), "ctypes": lambda: ( "drmaa" in self.config.get( "app:main", "start_job_runners" ).split(",") ) and sys.version_info[:2] == ( 2, 4 ), - "pysam": check_pysam() + "pysam": lambda: check_pysam() }.get( egg_name, lambda: True )() except: return False 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.