Try to clear out /var/tmp better.

1 files changed, 5 insertions, 5 deletions

diff --git a/cdistvm b/cdistvm
index 7772b82..e43ad82 100755
--- a/cdistvm
+++ b/cdistvm
@@ -44,7 +44,7 @@ if args.major is True:
 if args.checkout is not None:
     cdist_cmd += '--checkout %s ' % args.checkout
 if args.output is not None:
-    cdist_cmd += '--output %s ' % args.output
+    cdist_cmd += '--output cdistvm '
 if args.quiet is True:
     cdist_cmd += '--quiet '
 if args.keep is True:
@@ -69,12 +69,12 @@ ports = { 'fedora-22-32': 2000,
 
 vbox = subprocess.Popen('vboxheadless --startvm %s' % args.target, shell=True)
 time.sleep(10)
-command('ssh -p %d carl@localhost "rm -rf fedora-* arch-* /var/tmp/tmp*"' % ports[args.target])
+command('ssh -p %d carl@localhost "rm -rf cdistvm /var/tmp/tmp*"' % ports[args.target])
 command('ssh -p %d carl@localhost %s' % (ports[args.target], cdist_cmd))
-if args.output is not None:
+if args.command in ['package', 'doxygen', 'manual', 'changelog', 'pot']:
     tmp = tempfile.mkdtemp()
-    command('scp -P %d carl@localhost:%s/* %s/' % (ports[args.target], args.target, tmp))
-    command('scp %s/*.rpm %s/' % (tmp, args.output))
+    command('scp -r -P %d carl@localhost:cdistvm/* %s/' % (ports[args.target], tmp))
+    command('scp -r %s/* %s/' % (tmp, args.output))
     shutil.rmtree(tmp)
 
 try: