From 671224b64c9478644125deec1496a27e8f579da9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 28 Oct 2007 22:24:11 -0500 Subject: pactest: generate the filelist the correct way Actually use python commands to generate the filelist instead of os.system calls that don't necessarily work everywhere. Noticed when running "make check" on FreeBSD where the tar program is actually bsdtar. Signed-off-by: Dan McGee --- pactest/pmpkg.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pactest/pmpkg.py b/pactest/pmpkg.py index c302d2ae..c6859e8f 100755 --- a/pactest/pmpkg.py +++ b/pactest/pmpkg.py @@ -165,13 +165,23 @@ class pmpkg: # .FILELIST if self.files: - os.system("tar cvf /dev/null * | sort >.FILELIST") + # generate a filelist + filelist = [] + current = "" + for path, dirs, files in os.walk("."): + # we have to strip the './' portion from the path + # and add a newline to each entry. + current = os.path.join(path, "")[2:] + if len(current) != 0: + filelist.append(current + "\n") + for file in files: + # skip .PKGINFO, etc. + if(not file.startswith(".")): + filelist.append(os.path.join(path, file)[2:] + "\n") + f = open('.FILELIST', 'w') + f.writelines(filelist) + f.close() targets += " .FILELIST *" - else: - #prevent some pacman warnings... I expect a real package would - #always have at least one file... - os.system("touch .FILELIST") - targets += " .FILELIST" #safely create the dir mkdir(os.path.dirname(self.path)) -- cgit v1.2.3-70-g09d2