[pacman-dev] python-2.7 and pacman test-suite

[Rémy Oudompheng]

Dan McGee <dpmcgee at gmail.com> wrote:
> A trivial fix that doesn't work for anything pre-2.7 though, which is bad news.

May I suggest this much less ugly patch ? The idea of recursively
adding non-recursively things seems indeed very odd.

-- 
Rémy.
-------------- next part --------------
diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py
index 48d79a3..1d55175 100755
--- a/test/pacman/pmpkg.py
+++ b/test/pacman/pmpkg.py
@@ -164,14 +164,8 @@ def makepkg(self, path):
 
         # 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)