From 238194e8178b43ec216c1ca1b1fd9dc3829c5d20 Mon Sep 17 00:00:00 2001 From: yma Date: Tue, 23 Dec 2025 15:27:36 +0800 Subject: [PATCH 1/3] Fix merged zip arcname file path issue --- charon/cmd/cmd_merge.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charon/cmd/cmd_merge.py b/charon/cmd/cmd_merge.py index 3371ef7..0a3effc 100644 --- a/charon/cmd/cmd_merge.py +++ b/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) From 289d9eb73a73290c1a1fcfa9d1362adbcdeff8a5 Mon Sep 17 00:00:00 2001 From: yma Date: Mon, 29 Dec 2025 12:38:23 +0800 Subject: [PATCH 2/3] Add the single tarball extract logic to avoid unnecessary merge files copy --- charon/pkgs/maven.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/charon/pkgs/maven.py b/charon/pkgs/maven.py index 6b047f2..b0072d1 100644 --- a/charon/pkgs/maven.py +++ b/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 From 225787545f63631bd95ad3621e79e1e98736c9d9 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Mon, 1 Dec 2025 13:36:06 +0800 Subject: [PATCH 3/3] Fix a spec file issue Seems the changelog is using date decending order --- charon.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charon.spec b/charon.spec index b65ae52..d1ea517 100644 --- a/charon.spec +++ b/charon.spec @@ -69,6 +69,10 @@ export LANG=en_US.UTF-8 LANGUAGE=en_US.en LC_ALL=en_US.UTF-8 - Support recursive indexing for index function - Accept multiple maven zips for uploading +* Fri Jun 27 2025 Gang Li +- 1.4.0 release +- Add RADAS signature support + * Mon Jun 23 2025 Gang Li - 1.3.4 release - Add --version flag to support version check