diff options
| author | Steven Knight <knight@baldmt.com> | 2005-08-07 17:44:12 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-08-07 17:44:12 (GMT) |
| commit | 824f845a454876d2445d802b06d1ffe5d83f0aa5 (patch) | |
| tree | f2b455cbb2383ef36c88cd1a6e1aa7bc0b954b20 /src | |
| parent | 93fbfdd75a786a0e6c8b8663a6157a2d3a796bec (diff) | |
| download | SCons-824f845a454876d2445d802b06d1ffe5d83f0aa5.zip SCons-824f845a454876d2445d802b06d1ffe5d83f0aa5.tar.gz SCons-824f845a454876d2445d802b06d1ffe5d83f0aa5.tar.bz2 | |
Win32 portability.
Diffstat (limited to 'src')
| -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 |
3 files changed, 3 insertions, 3 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. """ |