From 8d8902f32ac7dcaea99566933ce82597976e129b Mon Sep 17 00:00:00 2001
From: Rusty Bird <rustybird@net-c.com>
Date: Wed, 13 Dec 2017 23:48:39 +0000
Subject: [PATCH] qvm-{copy,move}: fix spurious deprecation message

qvm-{copy,move} run qvm-{copy,move}-to-vm with $default as the VM
argument. Don't print the deprecation message in that case.
---
 qubes-rpc/qvm-copy-to-vm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qubes-rpc/qvm-copy-to-vm b/qubes-rpc/qvm-copy-to-vm
index ed3e7b4..196d1d4 100755
--- a/qubes-rpc/qvm-copy-to-vm
+++ b/qubes-rpc/qvm-copy-to-vm
@@ -42,8 +42,10 @@ if [ $PROGRESS_TYPE = console ] ; then
     export FILECOPY_TOTAL_SIZE
 fi
 
-echo "qvm-copy-to-vm/qvm-move-to-vm tools are deprecated," >&2
-echo "use qvm-copy/qvm-move to avoid typing target qube name twice" >&2
+if [ "$VM" != \$default ]; then
+    echo "qvm-copy-to-vm/qvm-move-to-vm tools are deprecated," >&2
+    echo "use qvm-copy/qvm-move to avoid typing target qube name twice" >&2
+fi
 
 /usr/lib/qubes/qrexec-client-vm "$VM" qubes.Filecopy /usr/lib/qubes/qfile-agent "$@"