mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-26 09:56:13 +01:00
Code

- reverted commit 9acda37d5f

Browse Source 
Now "get_built_files" always returns a tuple which consists of two strings.
So no cast is needed anymore.
This commit is contained in:
Marcus Huewe 2013-06-03 16:32:39 +02:00
parent 96183f41f3
commit 4736763c22
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc/build.py
View File

@ -269,11 +269,11 @@ def get_built_files(pacdir, pactype):
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'ARCHPKGS'), b_built = subprocess.Popen(['find', os.path.join(pacdir, 'ARCHPKGS'),
'-name', '*.pkg.tar*'], '-name', '*.pkg.tar*'],
stdout=subprocess.PIPE).stdout.read().strip() stdout=subprocess.PIPE).stdout.read().strip()
s_built = [] s_built = ''
else: else:
print('WARNING: Unknown package type \'%s\'.' % pactype, file=sys.stderr) print('WARNING: Unknown package type \'%s\'.' % pactype, file=sys.stderr)
b_built = [] b_built = ''
s_built = [] s_built = ''
return s_built, b_built return s_built, b_built
def get_repo(path): def get_repo(path):
@ -939,7 +939,7 @@ def main(apiurl, opts, argv):
print(b_built) print(b_built)
if opts.keep_pkgs: if opts.keep_pkgs:
for i in str(b_built).splitlines() + str(s_built).splitlines(): for i in b_built.splitlines() + s_built.splitlines():
shutil.copy2(i, os.path.join(opts.keep_pkgs, os.path.basename(i))) shutil.copy2(i, os.path.join(opts.keep_pkgs, os.path.basename(i)))
if bi_file: if bi_file: