Fix tests

Signed-off-by: Keshav Priyadarshi <[email protected]>

src/fetchcode/package.py

@@ -472,7 +472,9 @@ class UtilLinuxDirectoryListedSource(DirectoryListedSource):
     source_url = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/"
     is_nested = True
     # Source archive ex: util-linux-1.2.3.tar.gz
-    source_archive_regex = re.compile(r"^(util-linux-)(?P<version>[\w.-]*)(.tar.gz)$")
+    source_archive_regex = re.compile(
+        r"^(util-linux-|util-linux-ng-)(?P<version>[\w.-]*)(.tar.gz)$"
+    )
     ignored_files_and_dir = []
 
 

src/fetchcode/package_util.py

@@ -123,7 +123,13 @@ def _get_github_packages(purl, version_regex, ignored_tag_regex, default_package
         else:
             version = tag
 
-        version = version.strip("Vv").strip().replace("_", ".")
+        version = version.strip("Vv").strip()
+        if "+" in version:
+            first, last = version.split("+")
+            first.replace("_", ".")
+            version = f"{first}+{last}"
+        else:
+            version = version.replace("_", ".")
         if not version or not version[0].isdigit():
             continue
 

src/fetchcode/utils.py

@@ -117,6 +117,7 @@ class GitHubTokenError(Exception):
 class GraphQLError(Exception):
     pass
 
+
 def get_github_token():
     gh_token = os.environ.get("GH_TOKEN", None)
     if not gh_token:
@@ -152,9 +153,11 @@ def github_response(graphql_query):
 
     return response
 
+
 def get_github_rest(url):
     headers = None
-    if gh_token := get_github_token():
+    gh_token = get_github_token()
+    if gh_token:
         headers = {
             "Authorization": f"Bearer {gh_token}",
         }