From 1a5023ff2844f9de2deecc43aa54532fbb9f4e7e Mon Sep 17 00:00:00 2001
From: Marcus Huewe <suse-tux@gmx.de>
Date: Wed, 11 Aug 2010 22:50:10 +0200
Subject: [PATCH] - simplify + always remove tmpfile

---
 osc/core.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osc/core.py b/osc/core.py
index 4078f969..faddedb6 100644
--- a/osc/core.py
+++ b/osc/core.py
@@ -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.'