[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 66 matching lines @@
       if name == "Chrome Revision":
         revision = value.strip()
       if name == "Chrome Commit Position":
         commit_position = value.strip()
 
   if revision is None or version is None or commit_position is None:
     raise Error("error parsing SDK README: %s" % readme)
 
   try:
     version = int(version)
+    revision = int(revision)
   except ValueError:
     raise Error("error parsing SDK README: %s" % readme)
 
   return (version, revision, commit_position)
 
 
 def GetSystemArch(platform):
   if platform == 'win':
     if UseWin64():
       return 'x86_64'
@@ skipping 79 matching lines @@
 
   arch = match.group(2)
   if 'arm' in arch:
     return 'arm'
   if '64' in arch:
     return 'x86_64'
   return 'x86_32'
 
 
 def ParseVersion(version):
+  """Parses a version number of the form '<major>.<position>'.
+
+  <position> is the Cr-Commit-Position number.
+  """
   if '.' in version:
     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):
+  """Determines whether the current SDK version meets the required version.
+
+  Args:
+      required_version: (major, position) pair, where position is the
+      Cr-Commit-Position number.

[Sam Clegg, 2014/09/22 17:34:46]

I think docstrings use 2-space indentation like the code.

[Matt Giuca, 2014/09/23 01:07:36]

Yeah you're right. (I was looking at the style guide which has 4-space indents,
but that also has 4-space indents in the code. If the code is 2-space then so
should the docs be.)

[Sam Clegg, 2014/09/23 01:11:24]

Yes, the internal and external style guides differ on indentation for both
comments and code (annoying!)

+
+  Raises:
+      Error: The SDK version is older than required_version.
+  """
+  version = GetSDKVersion()[:2]
+  if version < required_version:
+    raise Error("SDK version too old (current: %d.%d, required: %d.%d)"
+           % (version[0], version[1], required_version[0], required_version[1]))
+
+
 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',
       help='Print major version of the NaCl SDK.')
   parser.add_option('--sdk-revision', action='store_true',
       help='Print revision number of the NaCl SDK.')
   parser.add_option('--sdk-commit-position', action='store_true',
       help='Print commit position of the NaCl SDK.')
   parser.add_option('--check-version',
+      metavar='MAJOR.POSITION',
       help='Check that the SDK version is at least as great as the '
-           'version passed in.')
+           'version passed in. MAJOR is the major version number and POSITION '
+           'is the Cr-Commit-Position number.')
 
   options, _ = parser.parse_args(args)
 
   platform = GetPlatform()
 
   if len(args) > 1:
     parser.error('Only one option can be specified at a time.')
 
   if not args:
     print platform
     return 0
 
   if options.arch:
     out = GetSystemArch(platform)
   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.sdk_commit_position:
     out = GetSDKVersion()[2]
   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)