Merge branch 'main' into release

Author: ligangty

charon/cmd/cmd_merge.py

@@ -151,6 +151,7 @@ def _create_merged_zip(
             for file in files:
                 file_path = os.path.join(root, file)
                 # Calculate relative path to preserve directory structure
-                arcname = os.path.relpath(file_path, root_path)
+                merged_repos_path = os.path.join(root_path, "merged_repositories")
+                arcname = os.path.relpath(file_path, merged_repos_path)
                 zipf.write(file_path, arcname)
         logger.info("Done for the merged zip generation: %s", zip_path)

charon/pkgs/maven.py

@@ -718,6 +718,21 @@ def _extract_tarballs(repos: List[str], root: str, prefix="", dir__=None) -> str
     # Create final merge directory
     final_tmp_root = mkdtemp(prefix=f"charon-{prefix}-final-", dir=dir__)
 
+    if len(repos) == 1:
+        if os.path.exists(repos[0]):
+            try:
+                logger.info("Extracting the single tarball %s", repos[0])
+                repo_zip = ZipFile(repos[0])
+                extract_zip_all(repo_zip, final_tmp_root)
+
+            except BadZipFile as e:
+                logger.error("Tarball extraction error for repo %s: %s", repos[0], e)
+                sys.exit(1)
+        else:
+            logger.error("Error: archive %s does not exist", repos[0])
+            sys.exit(1)
+        return final_tmp_root
+
     total_copied = 0
     total_duplicated = 0
     total_merged = 0