Skip to content
This repository has been archived by the owner on Oct 2, 2024. It is now read-only.

Commit

Permalink
Retired storage v6
Browse files Browse the repository at this point in the history
  • Loading branch information
alstar555 committed Sep 16, 2024
1 parent f2e5b13 commit 589b401
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions lib/filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ def init(self):
if (v_found == STORAGE_VERSION):
ch.VERBOSE("found storage dir v%d: %s" % (STORAGE_VERSION, self.root))
self.lock()
elif (v_found in {None, 6}): # initialize/upgrade
elif (v_found in {None}): # initialize/upgrade
ch.INFO("%s storage directory: v%d %s"
% (op, STORAGE_VERSION, self.root))
self.root.mkdir()
Expand All @@ -1188,16 +1188,6 @@ def init(self):
self.build_large.mkdir()
self.unpack_base.mkdir()
self.upload_cache.mkdir()
if (v_found is not None): # upgrade
if (v_found == 6):
# Charliecloud 0.32 had a bug where symlinks to fat manifests
# that were really skinny were erroneously absolute, making the
# storage directory immovable (PR #1657). Remove all symlinks
# in dlcache; they’ll be re-created later.
for entry in self.download_cache.iterdir():
if (entry.is_symlink()):
ch.DEBUG("deleting bad v6 symlink: %s" % entry)
entry.unlink()
self.version_file.file_write("%d\n" % STORAGE_VERSION)
else: # can’t upgrade
ch.FATAL("incompatible storage directory v%d: %s"
Expand Down

0 comments on commit 589b401

Please sign in to comment.