Merge branch 'chore---NY-2025' into split-nrpe-convenience-methods

itkovian · itkovian · commit e06b58f4694e · 2025-01-10T12:34:34.000+01:00
diff --git a/lib/vsc/__init__.py b/lib/vsc/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2024 Ghent University
+# Copyright 2015-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/__init__.py b/lib/vsc/utils/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2024 Ghent University
+# Copyright 2015-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/availability.py b/lib/vsc/utils/availability.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2024 Ghent University
+# Copyright 2012-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/cache.py b/lib/vsc/utils/cache.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2024 Ghent University
+# Copyright 2012-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -143,7 +143,13 @@ def load(self, key):
 
         @returns: (timestamp, data) if there is data for the given key, None otherwise.
         """
-        return self.new_shelf.get(key, None) or self.shelf.get(key, None)
+        result = None
+        if self.new_shelf is not None:
+            result = self.new_shelf.get(key, None)
+        if result is None and self.shelf is not None:
+            return self.shelf.get(key, None)
+
+        return result
 
     def retain(self):
         """Retain non-updated data on close."""
@@ -163,6 +169,8 @@ def close(self):
                 self.log.error('cannot open the file cache at %s for writing', self.filename)
             else:
                 if self.retain_old:
+                    if self.shelf is None:
+                        self.shelf = {}
                     self.shelf.update(self.new_shelf)
                     self.new_shelf = self.shelf
 
diff --git a/lib/vsc/utils/fs_store.py b/lib/vsc/utils/fs_store.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2024 Ghent University
+# Copyright 2012-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/graphyte.py b/lib/vsc/utils/graphyte.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2024-2024 Ghent University
+# Copyright 2024-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/lock.py b/lib/vsc/utils/lock.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2024 Ghent University
+# Copyright 2012-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/nagios.py b/lib/vsc/utils/nagios.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2024 Ghent University
+# Copyright 2012-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/pickle_files.py b/lib/vsc/utils/pickle_files.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2024 Ghent University
+# Copyright 2012-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/rest_oauth.py b/lib/vsc/utils/rest_oauth.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2024 Ghent University
+# Copyright 2012-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/script_tools.py b/lib/vsc/utils/script_tools.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2024 Ghent University
+# Copyright 2012-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/timestamp.py b/lib/vsc/utils/timestamp.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2024 Ghent University
+# Copyright 2009-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/timestamp_pid_lockfile.py b/lib/vsc/utils/timestamp_pid_lockfile.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2024 Ghent University
+# Copyright 2012-2025 Ghent University
 #
 # This file is part of vsc-utils,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2015-2024 Ghent University`
	`2`	`+# Copyright 2015-2025 Ghent University`
`3`	`3`	`#`
`4`	`4`	`# This file is part of vsc-utils,`
`5`	`5`	`# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2012-2024 Ghent University`
	`2`	`+# Copyright 2012-2025 Ghent University`
`3`	`3`	`#`
`4`	`4`	`# This file is part of vsc-utils,`
`5`	`5`	`# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2024-2024 Ghent University`
	`2`	`+# Copyright 2024-2025 Ghent University`
`3`	`3`	`#`
`4`	`4`	`# This file is part of vsc-utils,`
`5`	`5`	`# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),`