mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-24 22:06:14 +01:00
Code

- simplify + always remove tmpfile

Browse Source
This commit is contained in:
Marcus Huewe 2010-08-11 22:50:10 +02:00
parent 598a458718
commit 1a5023ff28
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osc/core.py
View File

@ -3661,22 +3661,24 @@ def copy_pac(src_apiurl, src_project, src_package,
else:
# copy one file after the other
import tempfile
tmpdir = tempfile.mkdtemp(prefix='osc_copypac')
os.chdir(tmpdir)
query = {'rev': 'upload'}
revision = show_upstream_srcmd5(src_apiurl, src_project, src_package, expand=expand, revision=revision)
for n in meta_get_filelist(src_apiurl, src_project, src_package, expand=expand, revision=revision):
print ' ', n
get_source_file(src_apiurl, src_project, src_package, n, targetfilename=n, revision=revision)
u = makeurl(dst_apiurl, ['source', dst_project, dst_package, pathname2url(n)], query=query)
http_PUT(u, file = n)
os.unlink(n)
tmpfile = None
try:
(fd, tmpfile) = tempfile.mkstemp(prefix='osc-copypac')
get_source_file(src_apiurl, src_project, src_package, n, targetfilename=tmpfile, revision=revision)
u = makeurl(dst_apiurl, ['source', dst_project, dst_package, pathname2url(n)], query=query)
http_PUT(u, file = n)
finally:
if not tmpfile is None:
os.unlink(tmpfile)
if comment:
query['comment'] = comment
query['cmd'] = 'commit'
u = makeurl(dst_apiurl, ['source', dst_project, dst_package], query=query)
http_POST(u)
os.rmdir(tmpdir)
return 'Done.'