[pacman-dev] [PATCH v2 8/8] Allow configure to select a Python 3 runtime.

Jeremy Heiner scalaprotractor at gmail.com
Sat Oct 12 12:44:37 EDT 2013


Also fix the "#!" lines in the test framework files to use whatever
runtime is found (the pactest main will bail if it is too old).

Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com>
---
 configure.ac           | 2 +-
 test/pacman/pactest.py | 2 +-
 test/pacman/pmdb.py    | 3 +--
 test/pacman/pmenv.py   | 3 +--
 test/pacman/pmfile.py  | 3 +--
 test/pacman/pmpkg.py   | 3 +--
 test/pacman/pmrule.py  | 3 +--
 test/pacman/pmtest.py  | 3 +--
 test/pacman/util.py    | 3 +--
 9 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index cfcc8d1..93f04bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ AC_SYS_LARGEFILE
 AC_PROG_AWK
 AC_PROG_CC_C99
 AC_PROG_INSTALL
-AC_CHECK_PROGS([PYTHON], [python2.7 python2 python], [false])
+AC_CHECK_PROGS([PYTHON], [python3 python2.7 python2 python], [false])
 AC_PATH_PROGS([BASH_SHELL], [bash bash4], [false])
 
 # check for perl 5.10.1 (needed by makepkg-template)
diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py
index e21cde7..1e46803 100755
--- a/test/pacman/pactest.py
+++ b/test/pacman/pactest.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2
+#! /usr/bin/python
 #
 #  pactest : run automated testing on the pacman binary
 #
diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py
index b4de281..a45a1d5 100644
--- a/test/pacman/pmdb.py
+++ b/test/pacman/pmdb.py
@@ -1,5 +1,4 @@
-#! /usr/bin/python2
-#
+
 #  Copyright (c) 2006 by Aurelien Foret <orelien at chez.com>
 #  Copyright (c) 2006-2013 Pacman Development Team <pacman-dev at archlinux.org>
 #
diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py
index f358285..930e61a 100644
--- a/test/pacman/pmenv.py
+++ b/test/pacman/pmenv.py
@@ -1,5 +1,4 @@
-#! /usr/bin/python2
-#
+
 #  Copyright (c) 2006 by Aurelien Foret <orelien at chez.com>
 #  Copyright (c) 2006-2013 Pacman Developmet Team <pacman-dev at archlinux.org>
 #
diff --git a/test/pacman/pmfile.py b/test/pacman/pmfile.py
index 49c0274..ae4a3ec 100644
--- a/test/pacman/pmfile.py
+++ b/test/pacman/pmfile.py
@@ -1,5 +1,4 @@
-#! /usr/bin/python2
-#
+
 #  Copyright (c) 2006 by Aurelien Foret <orelien at chez.com>
 #  Copyright (c) 2006-2013 Pacman Development Team <pacman-dev at archlinux.org>
 #
diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py
index 5a5e78e..7b9187b 100644
--- a/test/pacman/pmpkg.py
+++ b/test/pacman/pmpkg.py
@@ -1,5 +1,4 @@
-#! /usr/bin/python2
-#
+
 #  Copyright (c) 2006 by Aurelien Foret <orelien at chez.com>
 #  Copyright (c) 2006-2013 Pacman Development Team <pacman-dev at archlinux.org>
 #
diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py
index c97a158..0ebe877 100644
--- a/test/pacman/pmrule.py
+++ b/test/pacman/pmrule.py
@@ -1,5 +1,4 @@
-#! /usr/bin/python2
-#
+
 #  Copyright (c) 2006 by Aurelien Foret <orelien at chez.com>
 #  Copyright (c) 2006-2013 Pacman Development Team <pacman-dev at archlinux.org>
 #
diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py
index a1f3645d..dfd6159 100644
--- a/test/pacman/pmtest.py
+++ b/test/pacman/pmtest.py
@@ -1,5 +1,4 @@
-#! /usr/bin/python2
-#
+
 #  Copyright (c) 2006 by Aurelien Foret <orelien at chez.com>
 #  Copyright (c) 2006-2013 Pacman Development Team <pacman-dev at archlinux.org>
 #
diff --git a/test/pacman/util.py b/test/pacman/util.py
index 4d5ba8a..f573c4d 100644
--- a/test/pacman/util.py
+++ b/test/pacman/util.py
@@ -1,5 +1,4 @@
-#! /usr/bin/python2
-#
+
 #  Copyright (c) 2006 by Aurelien Foret <orelien at chez.com>
 #  Copyright (c) 2006-2013 Pacman Development Team <pacman-dev at archlinux.org>
 #
-- 
1.8.4



More information about the pacman-dev mailing list