Skip to content

Merge from main branch #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ligangty merged 6 commits into from
Jan 5, 2026
Merged

Merge from main branch #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
238194e
Fix merged zip arcname file path issue
yma955 Dec 23, 2025
903022b
Merge pull request #369 from yma955/main
yma955 Dec 24, 2025
289d9eb
Add the single tarball extract logic to avoid unnecessary merge files…
yma955 Dec 29, 2025
5d2d898
Merge pull request #370 from yma955/main
yma955 Dec 30, 2025
2257875
Fix a spec file issue
ligangty Dec 1, 2025
8060775
Merge branch 'main' into release
ligangty Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion charon/cmd/cmd_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
15 changes: 15 additions & 0 deletions charon/pkgs/maven.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down