[NaCl SDK] getos.py now checks against the Cr-Commit-Position.

native_client_sdk/src/tools/getos.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Determine OS and various other system properties.
 
 Determine the name of the platform used and other system properties such as
 the location of Chrome.  This is used, for example, to determine the correct
 Toolchain to invoke.
@@ skipping 173 matching lines @@
     version = version.split('.')
   else:
     version = (version, '0')
 
   try:
     return tuple(int(x) for x in version)
   except ValueError:
     raise Error('error parsing SDK version: %s' % version)
 
 
+def CheckVersion(required_version):
+  version = GetSDKVersion()
+  # We currently ignore the revision and just check the major version number.
+  # Currently, version[1] is just a Git hash, which cannot be compared.
+  # TODO(mgiuca): Compare the minor revision numbers (which should be
+  # Cr-Commit-Position values), when http://crbug.com/406783 is fixed.
+  # Then Cr-Commit-Position should be available: see http://crbug.com/406993.
+  if version[0] < required_version[0]:
+    raise Error("SDK version too old (current: %s, required: %s)"
+           % (version[0], required_version[0]))
+
+
 def main(args):
   parser = optparse.OptionParser()
   parser.add_option('--arch', action='store_true',
       help='Print architecture of current machine (x86_32, x86_64 or arm).')
   parser.add_option('--chrome', action='store_true',
       help='Print the path chrome (by first looking in $CHROME_PATH and '
            'then $PATH).')
   parser.add_option('--nacl-arch', action='store_true',
       help='Print architecture used by NaCl on the current machine.')
   parser.add_option('--sdk-version', action='store_true',
@@ skipping 20 matching lines @@
   elif options.nacl_arch:
     out = GetNaClArch(platform)
   elif options.chrome:
     out = GetChromePath(platform)
   elif options.sdk_version:
     out = GetSDKVersion()[0]
   elif options.sdk_revision:
     out = GetSDKVersion()[1]
   elif options.check_version:
     required_version = ParseVersion(options.check_version)
-    version = GetSDKVersion()
-    # We currently ignore the revision and just check the major version number.
-    # Currently, version[1] is just a Git hash, which cannot be compared.
-    # TODO(mgiuca): Compare the minor revision numbers (which should be
-    # Cr-Commit-Position values), when http://crbug.com/406783 is fixed.
-    # Then Cr-Commit-Position should be available: see http://crbug.com/406993.
-    if version[0] < required_version[0]:
-      raise Error("SDK version too old (current: %s, required: %s)"
-             % (version[0], required_version[0]))
+    CheckVersion(required_version)
     out = None
 
   if out:
     print out
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as e:
     sys.stderr.write(str(e) + '\n')
     sys.exit(1)