Fixed cfengine dev update-dependency-tables

Signed-off-by: Ole Herman Schumacher Elgesem <[email protected]>

Author: olehermanse

src/cfengine_cli/deptool.py

@@ -177,6 +177,10 @@ def checkout(self, ref, remote="origin", new=False):
             self.run_command("checkout", "-b", ref)
         else:
             # first, ensure that we're aware of target ref
+            # TODO: Move this to one global fetch, it will be
+            #       generally faster and not break when remote
+            #       is something else (i.e. upstream, not origin).
+            #       git fetch --all --tags
             self.run_command("fetch", remote, ref)
             # switch to the ref
             self.run_command("checkout", ref)
@@ -321,6 +325,8 @@ def deps_versions(self, ref):
         deps_versions = {}
         deps_list = self.deps_list(ref)
         for dep in deps_list:
+            if dep == "$EMBEDDED_DB":
+                continue
             deps_versions[dep] = self.get_current_version(dep)
         return deps_versions
 
@@ -800,7 +806,7 @@ def print_release_dependency_tables(versions) -> int:
         json_path=None,
         cdx_sbom_path_template=None,
         patch=False,
-        skip_unchanged=True,
+        skip_unchanged=False,
     )
     return 0
 

src/cfengine_cli/dev.py

@@ -34,9 +34,10 @@ def update_dependency_tables() -> int:
 
 
 def print_dependency_tables(args) -> int:
+    versions = args.versions
     answer = _expect_repo("buildscripts")
     if answer:
-        return print_release_dependency_tables(args)
+        return print_release_dependency_tables(versions)
     return 1
 
 

src/cfengine_cli/main.py

@@ -61,7 +61,8 @@ def _get_arg_parser():
     )
     dev_subparsers = dev_parser.add_subparsers(dest="dev_command")
     dev_subparsers.add_parser("update-dependency-tables")
-    dev_subparsers.add_parser("print-dependency-tables")
+    pdt = dev_subparsers.add_parser("print-dependency-tables")
+    pdt.add_argument("versions", nargs="*", help="Versions to compare")
     dev_subparsers.add_parser("format-docs")
     dev_subparsers.add_parser("lint-docs")
     dev_subparsers.add_parser("generate-release-information")