mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-11 05:23:48 +01:00
Code

Merge pull request #551 from lethliel/python3_fix_add_directory

Browse Source 
[python3] fix adding dirs as compressed archive
This commit is contained in:
Marco Strigl 2019-05-14 15:23:52 +02:00 committed by GitHub
commit 3266e43164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osc/core.py
View File

@ -7144,10 +7144,11 @@ def addFiles(filenames, prj_obj = None):
todo = [os.path.join(p, elm) todo = [os.path.join(p, elm)
for p, dirnames, fnames in os.walk(filename, followlinks=False) for p, dirnames, fnames in os.walk(filename, followlinks=False)
for elm in dirnames + fnames] for elm in dirnames + fnames]
enc_todo = [b'%s' % elem.encode() for elem in todo]
with open(archive, 'w') as f: with open(archive, 'w') as f:
cpio_proc = subprocess.Popen(['cpio', '-o', '-H', 'newc', '-0'], cpio_proc = subprocess.Popen(['cpio', '-o', '-H', 'newc', '-0'],
stdin=subprocess.PIPE, stdout=f) stdin=subprocess.PIPE, stdout=f)
cpio_proc.communicate('\0'.join(todo)) cpio_proc.communicate(b'\0'.join(enc_todo))
pacs.extend(findpacs([archive])) pacs.extend(findpacs([archive]))
for pac in pacs: for pac in pacs: