From: Peter Palfrader Date: Fri, 26 Apr 2013 07:28:19 +0000 (+0200) Subject: Add componentname to tempdirs X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cf710a2f5fa536f601433238b3e6de63ccaa288b;p=mirror%2Fdsa-puppet.git Add componentname to tempdirs --- diff --git a/modules/roles/files/static-mirroring/static-master-run b/modules/roles/files/static-mirroring/static-master-run index fab3baa40..6ebe2be81 100755 --- a/modules/roles/files/static-mirroring/static-master-run +++ b/modules/roles/files/static-mirroring/static-master-run @@ -120,8 +120,8 @@ def run_mirror(component): componentdir = os.path.join(basemaster, component) cur = componentdir + '-current-push' live = componentdir + '-current-live' - tmpdir_new = tempfile.mkdtemp(prefix='live.new-', dir=basemaster); cleanup_dirs.append(tmpdir_new); - tmpdir_old = tempfile.mkdtemp(prefix='live.old-', dir=basemaster); cleanup_dirs.append(tmpdir_old); + tmpdir_new = tempfile.mkdtemp(prefix=component+'-live.new-', dir=basemaster); cleanup_dirs.append(tmpdir_new); + tmpdir_old = tempfile.mkdtemp(prefix=component+'-live.old-', dir=basemaster); cleanup_dirs.append(tmpdir_old); os.chmod(tmpdir_new, 0755) locks = []