mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-23 00:08:50 -05:00
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 <dan@archlinux.org>
This commit is contained in:
parent
0dc34f496d
commit
671224b64c
@ -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))
|
||||
|
Loading…
Reference in New Issue
Block a user