On 28/09/10 12:24, Allan McRae wrote:
On 28/09/10 05:00, Rémy Oudompheng wrote:
Dan McGee<[email protected]> 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.
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)
That looks fine to me... but then again, I seem to be missing the whole
point of non-recursively adding directories in the first place.
I have put this on my working branch in the meantime.
Forgot. Tested python-2.6 and python-2.7. We also have python-2.5 in
the list of usable python's so it may be worth someone running the test
suite with that just to double check everything is still fine there.
Allan
