Merge branch 'release_15.03' into release_15.05

lib/galaxy/config.py

@@ -123,6 +123,7 @@ class Configuration( object ):
         self.manage_dependency_relationships = string_as_bool( kwargs.get( 'manage_dependency_relationships', False ) )
         self.running_functional_tests = string_as_bool( kwargs.get( 'running_functional_tests', False ) )
         self.hours_between_check = kwargs.get( 'hours_between_check', 12 )
+        self.enable_tool_shed_check = string_as_bool( kwargs.get( 'enable_tool_shed_check', False ) )
         if isinstance( self.hours_between_check, basestring ):
             self.hours_between_check = float( self.hours_between_check )
         try:

lib/tool_shed/galaxy_install/update_repository_manager.py

@@ -16,12 +16,13 @@ class UpdateRepositoryManager( object ):
         self.app = app
         self.context = self.app.install_model.context
         # Ideally only one Galaxy server process should be able to check for repository updates.
-        self.running = True
-        self.sleeper = Sleeper()
-        self.restarter = threading.Thread( target=self.__restarter )
-        self.restarter.daemon = True
-        self.restarter.start()
-        self.seconds_to_sleep = int( app.config.hours_between_check * 3600 )
+        if self.app.config.enable_tool_shed_check:
+            self.running = True
+            self.sleeper = Sleeper()
+            self.restarter = threading.Thread( target=self.__restarter )
+            self.restarter.daemon = True
+            self.restarter.start()
+            self.seconds_to_sleep = int( app.config.hours_between_check * 3600 )
 
     def get_update_to_changeset_revision_and_ctx_rev( self, repository ):
         """Return the changeset revision hash to which the repository can be updated."""
@@ -94,8 +95,9 @@ class UpdateRepositoryManager( object ):
         log.info( 'Update repository manager restarter shutting down...' )
 
     def shutdown( self ):
-        self.running = False
-        self.sleeper.wake()
+        if self.app.config.enable_tool_shed_check:
+            self.running = False
+            self.sleeper.wake()
 
     def update_repository_record( self, repository, updated_metadata_dict, updated_changeset_revision, updated_ctx_rev ):
         """