Merge pull request #2771 from FroggyFlox/2757-Failure-to-correct-poet…

…ry-paths-after-update Account for eventual double slahes in the conversion from legacy to poetry paths #2757
rockstor · Dec 21, 2023 · b870fa2 · b870fa2
2 parents 38da123 + ac26f15
commit b870fa2
Show file tree

Hide file tree

Showing 2 changed files with 2,381 additions and 1,305 deletions.
diff --git a/src/rockstor/scripts/initrock.py b/src/rockstor/scripts/initrock.py
@@ -417,7 +417,7 @@ def establish_poetry_paths():
     The local files in questions are defined in the LOCAL_FILES constant.
     """
     logger.info("### BEGIN Establishing poetry path to binaries in local files...")
-    pattern = "/opt/rockstor/bin/"
+    pattern = "/opt/rockstor[/]+bin/"
     replacement = "/opt/rockstor/.venv/bin/"
     for local_file in LOCAL_FILES:
         if os.path.isfile(LOCAL_FILES[local_file].path):