Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setup: always decode xcode version
authorAugie Fackler <augie@google.com>
Wed, 02 Mar 2022 10:30:37 -0500
changeset 48838 cd3e25adcf84
parent 48837 12cba4886e90
child 48839 7b068abe4aa2
setup: always decode xcode version Not decoding was a Python 2 thing. Differential Revision: https://phab.mercurial-scm.org/D12282
setup.py file | annotate | diff | comparison | revisions 
--- a/setup.py	Wed Mar 02 10:29:54 2022 -0500
+++ b/setup.py	Wed Mar 02 10:30:37 2022 -0500
@@ -1663,9 +1663,7 @@
 if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
     version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[1].splitlines()
     if version:
-        version = version[0]
-        if sys.version_info[0] == 3:
-            version = version.decode('utf-8')
+        version = version[0].decode('utf-8')
         xcode4 = version.startswith('Xcode') and StrictVersion(
             version.split()[1]
         ) >= StrictVersion('4.0')
mercurial