Unify the version string to be displayed on "About Chromium" dialog.

webkit/build/webkit_version.py

Index: webkit/build/webkit_version.py
diff --git a/webkit/build/webkit_version.py b/webkit/build/webkit_version.py
index c365b1875ddd7d48d95e8c84270e11fab4f76147..2aeba1d675dd37dc5d1b351d7e9fd71a3068d317 100755
--- a/webkit/build/webkit_version.py
+++ b/webkit/build/webkit_version.py
@@ -60,7 +60,9 @@ def GetWebKitRevision(webkit_dir, version_file):
       default_lastchange=None,
       directory=os.path.join(webkit_dir, version_file_dir))
 
-  if (version_info.url.startswith(version_info.root) and
+  if (version_info.url and
+      version_info.root and
+      version_info.url.startswith(version_info.root) and

[Mark Mentovai, 2011/07/19 15:44:32]

What I meant was that you’ve changed the contents of version_info.url such that
version_info.root may no longer be a prefix.

Right?

       version_info.url.endswith(version_file_dir)):
     # Now compute the real WebKit URL by stripping off the version file
     # directory from the URL we get out of version_info.
@@ -73,6 +75,9 @@ def GetWebKitRevision(webkit_dir, version_file):
     # Just dump the output directly.
     webkit_url = version_info.url
 
+  if version_info.revision == None:
+    version_info.revision = '0'
+
   return "%s@%s" % (webkit_url, version_info.revision)
 
 
@@ -107,5 +112,3 @@ def main():
 
 if __name__ == "__main__":
   main()
-
-