Merge branch 'master' of git.carlh.net:git/cdist

diff --cc vmbuild
index e637d48619af8b427dd25a33ab337a3c9bb9c16c,25f068852701ce759e9bbaf7713a1409e865f58c..c83cc74099a395a042017ecad37c49e4075062df
--- 1/vmbuild
--- 2/vmbuild
+++ b/vmbuild
@@@ -24,14 -24,15 +24,18 @@@ nohup vboxheadless --startvm fedora-22-
  vbox=$!
  sleep 10
  ssh -p $port carl@localhost "rm -rf fedora-*"
 +echo "run cdist..."
  ssh -p $port carl@localhost cdist -p dcpomatic -c $checkout -t host package
 +echo "copy from vm to $output..."
  if [ "$output" != "" ]; then
-     scp -P $port carl@localhost:fedora-22-$bits/* $output/
+     tmp=/var/tmp/copy.$$
+     mkdir -p $tmp
+     scp -P $port carl@localhost:fedora-22-$bits/* $tmp/
+     scp $tmp/*.rpm $output/
+     rm -rf $tmp
  fi
  set +e
 +echo "power off vm..."
  ssh -p $port carl@localhost "sudo /sbin/poweroff"
  set -e