Skip to content

Commit 56c5a33

Browse files
committed
Fix unnecessary file open during archetype catalog merge
1 parent cd7ed7a commit 56c5a33

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

charon/pkgs/maven.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -856,16 +856,12 @@ def _handle_archetype_catalog_merge(src_catalog: str, dest_catalog: str):
856856
logger.debug("DUPLICATE ARCHETYPE: %s", sa)
857857

858858
if len(dest_archetypes) != original_dest_size:
859-
with open(dest_catalog, 'wb'):
860-
content = MavenArchetypeCatalog(dest_archetypes).generate_meta_file_content()
861-
try:
862-
overwrite_file(dest_catalog, content)
863-
except FileNotFoundError as e:
864-
logger.error(
865-
"Error: Can not create file %s because of some missing folders",
866-
dest_catalog,
867-
)
868-
raise e
859+
content = MavenArchetypeCatalog(dest_archetypes).generate_meta_file_content()
860+
try:
861+
overwrite_file(dest_catalog, content)
862+
except Exception as e:
863+
logger.error("Failed to merge archetype catalog: %s", dest_catalog)
864+
raise e
869865

870866

871867
def _scan_paths(files_root: str, ignore_patterns: List[str],

0 commit comments

Comments
 (0)