Fetch the SVN revision number correctly regardless of line endings...

build/util/lastchange.py

 #!/usr/bin/env python
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 lastchange.py -- Chromium revision fetching utility.
 """
 
 import optparse
 import os
 import re
 import subprocess
 import sys
 
 
 def svn_fetch_revision():
   """
   Fetch the Subversion revision for the local tree.
 
   Errors are swallowed.
   """
   try:
     p = subprocess.Popen(['svn', 'info'],
                          stdout=subprocess.PIPE,
-                         stderr=subprocess.PIPE)
-  except OSError:
+                         stderr=subprocess.PIPE,
+                         shell=(sys.platform=='win32'))
+  except OSError, e:

[Mark Mentovai, 2009/06/16 21:21:28]

You don't need the ,e here.

     # 'svn' is apparently either not installed or not executable.
     return None
   revision = None
   if p:
-    svn_re = re.compile('^Revision:\s+(\S+)$', re.M)
+    svn_re = re.compile('^Revision:\s+(\d+)', re.M)
     m = svn_re.search(p.stdout.read())
     if m:
       revision = m.group(1)
   return revision
 
 
 def git_fetch_id():
   """
   Fetch the GIT identifier for the local tree.
 
   Errors are swallowed.
   """
   try:
     p = subprocess.Popen(['git', 'log', '-1'],
                          stdout=subprocess.PIPE,
-                         stderr=subprocess.PIPE)
+                         stderr=subprocess.PIPE,
+                         shell=(sys.platform=='win32'))
   except OSError:
     # 'git' is apparently either not installed or not executable.
     return None
   id = None
   if p:
     git_re = re.compile('^\s*git-svn-id:\s+(\S+)@(\d+)', re.M)
     m = git_re.search(p.stdout.read())
     if m:
       id = m.group(2)
   return id
@@ skipping 53 matching lines @@
   if out_file:
     write_if_changed(out_file, contents)
   else:
     sys.stdout.write(contents)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())