restage 0.7.0__tar.gz → 0.7.2__tar.gz

{restage-0.7.0/src/restage.egg-info → restage-0.7.2}/PKG-INFO

@@ -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 → restage-0.7.2}/src/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-0.7.0 → restage-0.7.2}/src/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 → restage-0.7.2/src/restage.egg-info}/PKG-INFO

@@ -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 → restage-0.7.2}/test/test_env_vars.py

@@ -1,3 +1,4 @@
+import os
 from unittest import TestCase
 from unittest.mock import patch
 from importlib import reload
@@ -31,6 +32,29 @@ class SettingsTests(TestCase):
         self.assertEqual(more[1],'/tmp/b')
         self.assertEqual(more[2],'/tmp/c')
 
+    @patch.dict(os.environ, {"RESTAGE_FIXED": ''})
+    def test_restage_none_fixed_config(self):
+        reload(restage.config)
+        from restage.config import config
+        from confuse.exceptions import ConfigTypeError
+        self.assertTrue(config['fixed'].exists())
+        self.assertTrue(config['fixed'].get() is None)
+        self.assertRaises(ConfigTypeError, config['fixed'].as_str_seq)
+
+    def test_missing_database_in_fixed_config(self):
+        from tempfile import TemporaryDirectory
+        from pathlib import Path
+        with TemporaryDirectory() as tmpdir:
+            self.assertFalse((Path(tmpdir) / 'database.db').exists())
+            with patch.dict(os.environ, {'RESTAGE_FIXED': tmpdir}):
+                reload(restage.config)
+                from restage.config import config
+                self.assertTrue(config['fixed'].exists())
+                self.assertEqual(config['fixed'].as_str(), tmpdir)
+                from restage.cache import FILESYSTEM
+                self.assertEqual(len(FILESYSTEM.db_fixed), 0)
+
+
     def test_restage_standard_config(self):
         from os import environ
         reload(restage.config)