Merge remote-tracking branch 'origin/pr/175'

* origin/pr/175:
  Support uncompressed archives fetched via git

README.md

@@ -412,6 +412,7 @@ We provide the following list of available keys:
 - `signature` --- URL of the signature file of downloaded external file (in
   combination with `url` and `pubkeys`).
 - `uncompress` --- Uncompress external file downloaded before verification.
+  In case of tarball created from git, do not compress it.
 - `pubkeys` --- List of public GPG keys to use for verifying the downloaded
   signature file (in combination with `url` and `signature`).
 - `git-url` --- URL of a repository to fetch and create a tarball from.

qubesbuilder/common.py

@@ -86,14 +86,16 @@ def get_archive_name(file: dict):
             return Path(fn).with_suffix("").name
         return fn
     if "git-basename" in file:
-        return f"{file['git-basename']}.tar.gz"
+        suffix = "tar" if file.get("uncompress", False) else "tar.gz"
+        return f"{file['git-basename']}.{suffix}"
     else:
         archive_base = os.path.basename(file["git-url"]).partition(".git")[0]
+        suffix = "tar" if file.get("uncompress", False) else "tar.gz"
         if "tag" in file:
             assert "/" not in file["tag"]
-            return f"{archive_base}-{file['tag']}.tar.gz"
+            return f"{archive_base}-{file['tag']}.{suffix}"
         if "commit-id" in file:
-            return f"{archive_base}-{file['commit-id']}.tar.gz"
+            return f"{archive_base}-{file['commit-id']}.{suffix}"
     return None
 
 

tests/test_functions.py

@@ -317,3 +317,12 @@ def test_get_archive_name_git_url():
     }
     fn = get_archive_name(file)
     assert fn == "repo-2.0.0.tar.gz"
+
+    file = {
+        "git-url": "https://github.com/owner/repo",
+        "tag": "v2.0.0",
+        "git-basename": "repo-2.0.0",
+        "uncompress": True,
+    }
+    fn = get_archive_name(file)
+    assert fn == "repo-2.0.0.tar"