From 3ead8f8859659595cab782dadcf84f6a462d85eb Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Sun, 27 Oct 2024 12:16:23 +0100
Subject: [PATCH] migrate_work_folder: print suffix in migration msg (MR 2460)
---
pmb/helpers/other.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pmb/helpers/other.py b/pmb/helpers/other.py
index fec6edf7d..f084302df 100644
--- a/pmb/helpers/other.py
+++ b/pmb/helpers/other.py
@@ -83,12 +83,14 @@ def migrate_work_folder():
context = get_context()
current = 0
suffix: str | None = None
+ current_with_suffix = ""
path = context.config.work / "version"
if os.path.exists(path):
with open(path) as f:
# pmb 2.3.x added a suffix due to conflicting work versions
# We need to be able to handle that going forward
- version_parts = f.read().rstrip().split("-")
+ current_with_suffix = f.read().rstrip()
+ version_parts = current_with_suffix.split("-")
current = int(version_parts[0])
if len(version_parts) == 2:
suffix = version_parts[1]
@@ -99,7 +101,7 @@ def migrate_work_folder():
return
logging.info(
"WARNING: Your work folder version needs to be migrated"
- " (from version " + str(current) + " to " + str(required) + ")!"
+ f" (from version {current_with_suffix} to {required})!"
)
# version 6 and version 7 from 2.3.x branch are equivalent for this and we need to migrate
--
GitLab