Francois Gouget : testbot/RestoreVM: Explicitly deleting the old disks may not be necessary.

Alexandre Julliard julliard at winehq.org
Thu Dec 17 15:29:53 CST 2020


Module: tools
Branch: master
Commit: ff73eb836e91f0f2f721a2927700b8217359221c
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=ff73eb836e91f0f2f721a2927700b8217359221c

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Dec 17 11:53:56 2020 +0100

testbot/RestoreVM: Explicitly deleting the old disks may not be necessary.

Normally virsh undefine --remove-all-storage handles it but it does not
follow the symbolic links. So tell rm not to complain if it finds no
file to delete.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/scripts/RestoreVM | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM
index 57e11c0..a1b9d15 100755
--- a/testbot/scripts/RestoreVM
+++ b/testbot/scripts/RestoreVM
@@ -641,7 +641,7 @@ then
     then
         fatal_no_cleanup "could not remove the existing '$opt_vm' VM"
     fi
-    [ -z "$olddisks" ] || dry_run rm $olddisks
+    [ -z "$olddisks" ] || dry_run rm -f $olddisks
 fi
 
 




More information about the wine-cvs mailing list