sync-webkit-git: exit with an error code on failure

tools/sync-webkit-git.py

 #!/usr/bin/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.
 
 """Update third_party/WebKit using git.
 
 Under the assumption third_party/WebKit is a clone of git.webkit.org,
 we can use git commands to make it match the version requested by DEPS.
 
@@ skipping 87 matching lines @@
   return True
 
 def UpdateCurrentCheckoutIfAppropriate():
   """Reset the current gclient branch if that's what we have checked out."""
   branch = RunGit(['symbolic-ref', '-q', 'HEAD'])
   if branch != MAGIC_GCLIENT_BRANCH:
     print "We have now updated the 'gclient' branch, but third_party/WebKit"
     print "has some other branch ('%s') checked out." % branch
     print "Run 'git checkout gclient' under third_party/WebKit if you want"
     print "to switch it to the version requested by DEPS."
-    return
+    return 1
 
   if subprocess.call(['git', 'diff-index', '--exit-code', '--shortstat',
                       'HEAD']):
     print "Resetting tree state to new revision."
     subprocess.check_call(['git', 'reset', '--hard'])
 
 def main():
   if not os.path.exists('third_party/WebKit/.git'):
     if os.path.exists('third_party/WebKit'):
       print "ERROR: third_party/WebKit appears to not be under git control."
     else:
       print "ERROR: third_party/WebKit could not be found."
       print "Did you run this script from the right directory?"
 
     print "See http://code.google.com/p/chromium/wiki/UsingWebKitGit for"
     print "setup instructions."
-    return
+    return 1
 
   webkit_rev = GetWebKitRev()
   print 'Desired revision: r%s.' % webkit_rev
   os.chdir('third_party/WebKit')
   changed = UpdateGClientBranch(webkit_rev)
   if changed:
-    UpdateCurrentCheckoutIfAppropriate()
+    return UpdateCurrentCheckoutIfAppropriate()
   else:
     print "Already on correct revision."

[tony, 2010/07/17 01:26:54]

Nit: Specify a return 0 at the end of the function.

 
 if __name__ == '__main__':
-  main()
+  sys.exit(main())