Win32 portability.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1317 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index ca7bd28236895300be7c95e12e7465d0bc8eb14d..dbe7749285746e991199a766ad31a7c7df24c0f9 100644 (file)
--- 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 637e50371fac1dd157bf59c5dff9ddba2328a819..18a12022e453cc4344802d5e6e8e84a8a62708d5 100644 (file)
--- 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 56152e59537ea898902ca852f85672d75040ca59..6f19d568b8900e1fd42ddcfd42282772ec20a0b9 100644 (file)
--- 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 8d2d6a66574c302b14aad3726b79d13863afb594..624c18bd390322bbb70c84480e0e26014350b347 100644 (file)
--- 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+