restage 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

restage/cache.py

@@ -26,10 +26,18 @@ class FileSystem:
                 path.mkdir(parents=True)
             db_write = Database(path / named)
             root = path
-        if config['fixed'].exists():
-            more = [Path(c) for c in config['fixed'].as_str_seq() if Path(c).exists()]
+
+        def exists_not_root(roc):
+            roc = Path(roc)
+            if not roc.exists() or not (roc / named).exists():
+                return False
+            return root.resolve() != roc.resolve() if root is not None else True
+
+        if config['fixed'].exists() and config['fixed'].get() is not None:
+            more = [Path(c) for c in config['fixed'].as_str_seq() if exists_not_root(c)]
             for m in more:
                 db_fixed.append(Database(m / named, readonly=True))
+
         if db_write is not None and db_write.readonly:
             raise ValueError("Specified writable database location is readonly")
         if db_write is None:

restage/mcpl.py

@@ -15,7 +15,6 @@ def mcpl_real_filename(filename: Path) -> Path:
         check = base.with_suffix(ext)
         if check.exists() and check.is_file():
             return check
-        print(f'{base} -> {check} not found')
     raise FileNotFoundError(f'Could not find MCPL file {filename}')
 
 

{restage-0.7.0.dist-info → restage-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restage
-Version: 0.7.0
+Version: 0.7.2
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 License: BSD-3-Clause
 Classifier: License :: OSI Approved :: BSD License

{restage-0.7.0.dist-info → restage-0.7.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 restage/__init__.py,sha256=HlqvPpL7DKet00NAFyqJBNg9UFO7o05Gt2tFyKBQcsY,744
 restage/bifrost_choppers.py,sha256=xQu21g2NcTLPpZ0ZWOuvN20zh07EWoO4QVoTnoORwZI,6443
-restage/cache.py,sha256=Xep5j7jzq_qppp1i-KNSxZLpvyeZdDJkTMnB_PEE1gM,7824
+restage/cache.py,sha256=wh8b66aUDtOu38L-B-tqLs-bMtrnbWmuhy_HaKRYOsA,8102
 restage/cspec_choppers.py,sha256=ZWxyCcwYn4z9ZNqj_r6RC9ImbhVjYc1fmv-Ijm8A2Yk,206
 restage/database.py,sha256=anyOby31fUN7rGAVNsnWDUhAISV0vQ7en8aQwVS5ZwA,11051
 restage/emulate.py,sha256=VrhfZJIbECdbDS-MHklqRuAIy9cRkjZkwPBTKQSQoe0,6164
 restage/energy.py,sha256=w78GUIWcHxANvBl2DTu73FQFawCXfzlK6L32TBQNt4g,3371
 restage/instr.py,sha256=A0ShtXkswt_f7o-cIDtsVbG03_tGELe1aS3WzLxzkJM,2494
-restage/mcpl.py,sha256=MKVY-2TYk5p8hW1lXJib5mxdbnILq4GoYiyAUgOBJmA,3269
+restage/mcpl.py,sha256=u7ixerJs4lqKSW2MYndZ2Xpsk8O0S-ZVo735YIy86gc,3223
 restage/range.py,sha256=TjOf4DSKfgoAIcrWQvv6MrtksQpnGJHdsEjVI5K-UfI,8116
 restage/run.py,sha256=bTcQIN9edKMXU_eFdX3E_mtJjwemoARrIUmZqzEGf0E,1475
 restage/scan.py,sha256=Yx8OQSBG6I2_64sW0LIDb0glVKwWoxUQQznASXgDZFQ,1432
@@ -14,8 +14,8 @@ restage/splitrun.py,sha256=W_pTeiMjc9hhu-zaE6fdetVLG6MGEpnaTOdgmgVkS1g,26061
 restage/tables.py,sha256=vQf0GkM7ojQbWee_P_Xqfx0-lXLym7x6kyam8CWpB5s,16373
 restage/config/__init__.py,sha256=zFRT9QXgpUJpBncELCQ6by1-kjYp8Li1yJDfqxkHxAA,965
 restage/config/default.yaml,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-restage-0.7.0.dist-info/METADATA,sha256=VTicESA3b8fD__6eT-P_Upsx8Nb8AygdlMqT9K50PN8,6606
-restage-0.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-restage-0.7.0.dist-info/entry_points.txt,sha256=vYNOPxJ4PzG-1GGFSd08jFxhrtKUWAdWzjJQeFBzFJE,116
-restage-0.7.0.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
-restage-0.7.0.dist-info/RECORD,,
+restage-0.7.2.dist-info/METADATA,sha256=kNw5CzeloKGwxJEso0WrVAL4OwrMDFTAmYQEX4Bp1W4,6606
+restage-0.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+restage-0.7.2.dist-info/entry_points.txt,sha256=vYNOPxJ4PzG-1GGFSd08jFxhrtKUWAdWzjJQeFBzFJE,116
+restage-0.7.2.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
+restage-0.7.2.dist-info/RECORD,,