Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
  • Loading branch information
perseoGI committed Dec 27, 2024
1 parent 49e3f39 commit 5032b3c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions conan/api/subapi/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def restore(self, path):
pkg_layout = cache.create_pkg_layout(pref) # DB Folder entry
# FIXME: This is not taking into account the existence of previous package
unzipped_pkg_folder = pref_bundle["package_folder"]
out.info(f"Restore: {pref} from {unzipped_pkg_folder}")
out.info(f"Restore: {pref} in {unzipped_pkg_folder}")
# If the DB folder entry is different to the disk unzipped one, we need to move it
# This happens for built (not downloaded) packages in the source "conan cache save"
db_pkg_folder = os.path.relpath(pkg_layout.package(), cache_folder)
Expand All @@ -213,7 +213,7 @@ def restore(self, path):
unzipped_metadata_folder = pref_bundle.get("metadata_folder")
if unzipped_metadata_folder:
# FIXME: Restore metadata is not incremental, but destructive
out.info(f"Restore: {pref} metadata from {unzipped_metadata_folder}")
out.info(f"Restore: {pref} metadata in {unzipped_metadata_folder}")
db_metadata_folder = os.path.relpath(pkg_layout.metadata(), cache_folder)
db_metadata_folder = db_metadata_folder.replace("\\", "/")
if db_metadata_folder != unzipped_metadata_folder:
Expand Down

0 comments on commit 5032b3c

Please sign in to comment.