summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-08-07 17:44:12 (GMT)
committerSteven Knight <knight@baldmt.com>2005-08-07 17:44:12 (GMT)
commite533041b779711bb840eb5b7121bd8f9509830f3 (patch)
treef2b455cbb2383ef36c88cd1a6e1aa7bc0b954b20 /src/engine
parent1b74d9072cf0effc88f957be06b198891d0bcd35 (diff)
downloadSCons-e533041b779711bb840eb5b7121bd8f9509830f3.zip
SCons-e533041b779711bb840eb5b7121bd8f9509830f3.tar.gz
SCons-e533041b779711bb840eb5b7121bd8f9509830f3.tar.bz2
Win32 portability.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Node/FS.py2
-rw-r--r--src/engine/SCons/dblite.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index ca7bd28..dbe7749 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -908,7 +908,7 @@ class FS(LocalFS):
except KeyError:
if not create:
raise SCons.Errors.UserError
- directory = RootDir(drive, self)
+ directory = RootDir(_my_normcase(drive), self)
self.Root[drive] = directory
if not path_orig:
diff --git a/src/engine/SCons/dblite.py b/src/engine/SCons/dblite.py
index 637e503..18a1202 100644
--- a/src/engine/SCons/dblite.py
+++ b/src/engine/SCons/dblite.py
@@ -64,7 +64,7 @@ class dblite:
if (len(p) > 0):
try:
self._dict = cPickle.loads(p)
- except cPickle.UnpicklingError:
+ except (cPickle.UnpicklingError, EOFError):
if (ignore_corrupt_dbfiles == 0): raise
if (ignore_corrupt_dbfiles == 1):
corruption_warning(self._file_name)