diff options
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/dblite.py | 2 | ||||
| -rw-r--r-- | src/script/sconsign.py | 2 | ||||
| -rw-r--r-- | test/sconsign/script.py | 12 |
4 files changed, 9 insertions, 9 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) diff --git a/src/script/sconsign.py b/src/script/sconsign.py index 56152e5..6f19d56 100644 --- a/src/script/sconsign.py +++ b/src/script/sconsign.py @@ -387,7 +387,7 @@ Options: -i, --implicit Print implicit dependency information. -r, --readable Print timestamps in human-readable form. --raw Print raw Python object representations. - -s, --size Print file sizes human-readable form. + -s, --size Print file sizes. -t, --timestamp Print timestamp information. -v, --verbose Verbose, describe each field. """ diff --git a/test/sconsign/script.py b/test/sconsign/script.py index 8d2d6a6..624c18b 100644 --- a/test/sconsign/script.py +++ b/test/sconsign/script.py @@ -123,9 +123,9 @@ hello.obj: \S+ None \d+ \d+ test.run_sconsign(arguments = "--raw work1/sub1/.sconsign", stdout = """\ -hello.exe: {'bsig': '\S+', 'size': \d+, 'timestamp': \d+} +hello.exe: {'bsig': '\S+', 'size': \d+L?, 'timestamp': \d+} hello.obj: \S+ -hello.obj: {'bsig': '\S+', 'size': \d+, 'timestamp': \d+} +hello.obj: {'bsig': '\S+', 'size': \d+L?, 'timestamp': \d+} hello.c: \S+ """) @@ -326,14 +326,14 @@ hello.obj: \S+ None \d+ \d+ test.run_sconsign(arguments = "--raw work2/.sconsign", stdout = """\ === sub1: -hello.exe: {'bsig': '\S+', 'size': \d+, 'timestamp': \d+} +hello.exe: {'bsig': '\S+', 'size': \d+L?, 'timestamp': \d+} hello.obj: \S+ -hello.obj: {'bsig': '\S+', 'size': \d+, 'timestamp': \d+} +hello.obj: {'bsig': '\S+', 'size': \d+L?, 'timestamp': \d+} hello.c: \S+ === sub2: -hello.exe: {'bsig': '\S+', 'size': \d+, 'timestamp': \d+} +hello.exe: {'bsig': '\S+', 'size': \d+L?, 'timestamp': \d+} hello.obj: \S+ -hello.obj: {'bsig': '\S+', 'size': \d+, 'timestamp': \d+} +hello.obj: {'bsig': '\S+', 'size': \d+L?, 'timestamp': \d+} hello.c: \S+ inc1.h: \S+ inc2.h: \S+ |