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.
packaging: make python snippets in rpm building python3 compatible stable
authorMads Kiilerich <mads@kiilerich.com>
Sun, 27 Oct 2019 20:17:33 +0100
branchstable
changeset 43340 e0812b032bcc
parent 43339 1a0d419ec763
child 43341 92a51a45d44c
packaging: make python snippets in rpm building python3 compatible Fedora 31 has Python3 at /usr/bin/python, and buildrpm would fail on snippets that use python2 syntax. Instead of forcing python2, just accept for the future while staying backwards compatible.
contrib/packaging/buildrpm file | annotate | diff | comparison | revisions
contrib/packaging/mercurial.spec file | annotate | diff | comparison | revisions 
--- a/contrib/packaging/buildrpm	Wed Oct 30 21:49:48 2019 +0900
+++ b/contrib/packaging/buildrpm	Sun Oct 27 20:17:33 2019 +0100
@@ -121,8 +121,8 @@
     if prevtitle != title:
         prevtitle = title
         print
-        print title
-    print "- %s" % l[3].strip()
+        print(title)
+    print("- %s" % l[3].strip())
 ' >> $rpmspec
 
 else
@@ -138,7 +138,7 @@
 for l in sys.stdin.readlines():
     tok = l.split("\t")
     hgdate = tuple(int(v) for v in tok[0].split())
-    print "* %s %s\n- %s" % (datestr(hgdate, "%a %b %d %Y"), tok[1], tok[2])
+    print("* %s %s\n- %s" % (datestr(hgdate, "%a %b %d %Y"), tok[1], tok[2]))
 ' >> $rpmspec
 
 fi
--- a/contrib/packaging/mercurial.spec	Wed Oct 30 21:49:48 2019 +0900
+++ b/contrib/packaging/mercurial.spec	Sun Oct 27 20:17:33 2019 +0100
@@ -15,7 +15,7 @@
 
 %else
 
-%global pythonver %(python -c 'import sys;print ".".join(map(str, sys.version_info[:2]))')
+%global pythonver %(python -c 'import sys;print(".".join(map(str, sys.version_info[:2])))')
 
 %endif
mercurial