Merge pull request #891 from mvdbeek/repair_repository_id_fix

Only return repository if it is not None ( This happens for the repo…
galaxyproject · Oct 14, 2015 · 744ed8c · 744ed8c
2 parents 6c95ef9 + c64f27e
commit 744ed8c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/tool_shed/galaxy_install/repair_repository_manager.py b/lib/tool_shed/galaxy_install/repair_repository_manager.py
@@ -37,7 +37,7 @@ def get_installed_repositories_from_repository_dependencies( self, repository_de
                                                                      name=name,
                                                                      owner=owner,
                                                                      changeset_revision=changeset_revision )
-                if installed_repository not in installed_repositories:
+                if ( installed_repository ) and ( installed_repository not in installed_repositories ):
                     installed_repositories.append( installed_repository )
                 for rd_val in rd_vals:
                     tool_shed, name, owner, changeset_revision = rd_val[ 0:4 ]
@@ -46,7 +46,7 @@ def get_installed_repositories_from_repository_dependencies( self, repository_de
                                                                          name=name,
                                                                          owner=owner,
                                                                          changeset_revision=changeset_revision )
-                    if installed_repository not in installed_repositories:
+                    if ( installed_repository ) and ( installed_repository not in installed_repositories ):
                         installed_repositories.append( installed_repository )
         return installed_repositories
 
@@ -75,6 +75,7 @@ def get_repair_dict( self, repository ):
             # Some repositories may have repository dependencies that are required to be installed before
             # the dependent repository, so we'll order the list of tsr_ids to ensure all repositories are
             # repaired in the required order.
+            installed_repositories.append(repository)
             for installed_repository in installed_repositories:
                 tsr_ids.append( self.app.security.encode_id( installed_repository.id ) )
                 repo_info_dict, tool_panel_section_key = self.get_repo_info_dict_for_repair( rdim,