summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-10-05 11:15:56 -0500
committerDan McGee <dan@archlinux.org>2010-10-05 11:15:56 -0500
commitbef19a266bf5d80b68cab02f6a3ccc3fcedbec6d (patch)
treee5a25721239bd6dd92dcca0e0922529e9c188f91
parentc0f58ea9a22c64e42b6784663ceb7272565428f5 (diff)
parent283ef6519aa20b8c63c9b916573b5f243ff7be2e (diff)
downloadpacman-bef19a266bf5d80b68cab02f6a3ccc3fcedbec6d.tar.xz
Merge branch 'maint'
-rw-r--r--configure.ac2
-rwxr-xr-xtest/pacman/pmpkg.py10
2 files changed, 3 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 2a6ab08c..e709fc4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,7 +126,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
-AC_CHECK_PROGS([PYTHON], [python2.6 python2.5 python], [false])
+AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false])
# find installed gettext
AM_GNU_GETTEXT([external])
diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py
index 48d79a35..1d55175e 100755
--- a/test/pacman/pmpkg.py
+++ b/test/pacman/pmpkg.py
@@ -164,14 +164,8 @@ class pmpkg:
# Generate package archive
tar = tarfile.open(self.path, "w:gz")
-
- # package files
- for root, dirs, files in os.walk('.'):
- for d in dirs:
- tar.add(os.path.join(root, d), recursive=False)
- for f in files:
- tar.add(os.path.join(root, f))
-
+ for i in os.listdir("."):
+ tar.add(i)
tar.close()
os.chdir(curdir)