Tidy up

metomi · Jan 10, 2024 · 997323e · 997323e
1 parent 0d5a14f
commit 997323e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/metomi/rose/config_processors/fileinstall.py b/metomi/rose/config_processors/fileinstall.py
@@ -204,7 +204,7 @@ def _process(self, conf_tree, nodes, loc_dao, **kwargs):
                         source.scheme = scheme
                         break
                 self.loc_handlers_manager.parse(source, conf_tree)
-            except ValueError as exc:
+            except ValueError:
                 if source.is_optional:
                     sources.pop(source.name)
                     for name in source.used_by_names:
@@ -215,7 +215,7 @@ def _process(self, conf_tree, nodes, loc_dao, **kwargs):
                 else:
                     raise ConfigProcessError(
                         ["file:" + source.used_by_names[0], "source"],
-                        source.name, exc
+                        source.name,
                     )
             prev_source = loc_dao.select(source.name)
             source.is_out_of_date = (

diff --git a/metomi/rose/loc_handlers/git.py b/metomi/rose/loc_handlers/git.py
@@ -56,8 +56,6 @@ def can_pull(self, loc):
         scheme = urlparse(loc.name).scheme
         if scheme in self.SCHEMES:
             return True
-      #  if scheme.startswith(self.GIT + "@"):
-      #      return True
         if self.URI_SEPARATOR not in loc.name:
             return False
         remote = self._parse_name(loc)[0]
@@ -126,7 +124,7 @@ def parse(self, loc, conf_tree):
 
         if typetext.strip() == "tree":
             loc.loc_type = loc.TYPE_TREE
-        else:  # if outtext == "blob":
+        else:
             loc.loc_type = loc.TYPE_BLOB
         loc.real_name = f"remote:{remote} ref:{ref} commit:{commithash} path:{path}"
         loc.key = commithash