[pacman-dev] [PATCH] Use the 'configure'd PYTHON to run pactest.

Jeremy Heiner scalaprotractor at gmail.com
Fri Dec 20 11:59:46 EST 2013


Instead of the one hard-coded (with '#!') in pactest.py.
Also remove useless '#!' from non-main .py files.

Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail.com>
---
 Makefile.am           | 2 +-
 test/pacman/pmdb.py   | 2 --
 test/pacman/pmenv.py  | 2 --
 test/pacman/pmfile.py | 2 --
 test/pacman/pmpkg.py  | 2 --
 test/pacman/pmrule.py | 2 --
 test/pacman/pmtest.py | 2 --
 test/pacman/util.py   | 2 --
 8 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4d5adae..d22c52e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 								 $(top_srcdir)/build-aux/tap-driver.sh
 PY_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 								 $(top_srcdir)/build-aux/tap-driver.sh
-PY_LOG_COMPILER = $(top_srcdir)/test/pacman/pactest.py
+PY_LOG_COMPILER = $(PYTHON) $(top_srcdir)/test/pacman/pactest.py
 AM_PY_LOG_FLAGS = \
 		--scriptlet-shell $(SCRIPTLET_SHELL) \
 		--ldconfig $(LDCONFIG) \
diff --git a/test/pacman/pmdb.py b/test/pacman/pmdb.py
index 53de91e..e64255e 100644
--- a/test/pacman/pmdb.py
+++ b/test/pacman/pmdb.py
@@ -1,5 +1,3 @@
-#! /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..2b021d1 100644
--- a/test/pacman/pmenv.py
+++ b/test/pacman/pmenv.py
@@ -1,5 +1,3 @@
-#! /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..7109873 100644
--- a/test/pacman/pmfile.py
+++ b/test/pacman/pmfile.py
@@ -1,5 +1,3 @@
-#! /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 6f7ae6e..3daa93f 100644
--- a/test/pacman/pmpkg.py
+++ b/test/pacman/pmpkg.py
@@ -1,5 +1,3 @@
-#! /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 cfcbb6b..9c11d5d 100644
--- a/test/pacman/pmrule.py
+++ b/test/pacman/pmrule.py
@@ -1,5 +1,3 @@
-#! /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..583007f 100644
--- a/test/pacman/pmtest.py
+++ b/test/pacman/pmtest.py
@@ -1,5 +1,3 @@
-#! /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 ab5a6f4..7947124 100644
--- a/test/pacman/util.py
+++ b/test/pacman/util.py
@@ -1,5 +1,3 @@
-#! /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.5.2



More information about the pacman-dev mailing list