1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00

Merge branch 'maint'

This commit is contained in:
Dan McGee 2010-10-05 11:15:56 -05:00
commit bef19a266b
2 changed files with 3 additions and 9 deletions

View File

@ -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])

View File

@ -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)