summaryrefslogtreecommitdiff
path: root/engine/SCons/CacheDir.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-08-10 08:40:26 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-08-10 08:40:26 +0200
commit829062d4941d1ee8e36c442adadb7f0f91b09a09 (patch)
tree7c621da5eab4fade5566feb544a1b299fa8503bc /engine/SCons/CacheDir.py
parenta0a7e6a528813424826ab447a0a01e61ee47a546 (diff)
parent3af57a8e6a18986c41351da2447363ede8565402 (diff)
Update upstream source from tag 'upstream/3.1.1'
Update to upstream version '3.1.1' with Debian dir bebda0c0b00c4097fcb012a73f945a8e197c5589
Diffstat (limited to 'engine/SCons/CacheDir.py')
-rw-r--r--engine/SCons/CacheDir.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/engine/SCons/CacheDir.py b/engine/SCons/CacheDir.py
index c9e8ea7..a1133ae 100644
--- a/engine/SCons/CacheDir.py
+++ b/engine/SCons/CacheDir.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/CacheDir.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
+__revision__ = "src/engine/SCons/CacheDir.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
__doc__ = """
CacheDir support
@@ -33,6 +33,7 @@ import os
import stat
import sys
+import SCons
import SCons.Action
import SCons.Warnings
from SCons.Util import PY3
@@ -185,7 +186,7 @@ class CacheDir(object):
pass
except OSError:
msg = "Failed to create cache directory " + path
- raise SCons.Errors.EnvironmentError(msg)
+ raise SCons.Errors.SConsEnvironmentError(msg)
try:
with open(config_file, 'x') as config:
@@ -194,14 +195,14 @@ class CacheDir(object):
json.dump(self.config, config)
except Exception:
msg = "Failed to write cache configuration for " + path
- raise SCons.Errors.EnvironmentError(msg)
+ raise SCons.Errors.SConsEnvironmentError(msg)
except FileExistsError:
try:
with open(config_file) as config:
self.config = json.load(config)
except ValueError:
msg = "Failed to read cache configuration for " + path
- raise SCons.Errors.EnvironmentError(msg)
+ raise SCons.Errors.SConsEnvironmentError(msg)
def _readconfig2(self, path):