moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-08 12:28:00 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -126,7 +126,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_LIBTOOL 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 # find installed gettext
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])

10
test/pacman/pmpkg.py
View File

@ -164,14 +164,8 @@ class pmpkg:
# Generate package archive # Generate package archive
tar = tarfile.open(self.path, "w:gz") tar = tarfile.open(self.path, "w:gz")
for i in os.listdir("."):
# package files tar.add(i)
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))
tar.close() tar.close()
os.chdir(curdir) os.chdir(curdir)