From a1f86667fb1ab2ef4e3ecedee1b44f2d686c22c3 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Wed, 9 Jan 2013 16:32:24 +0100 Subject: [PATCH] Bug #1721: Add extra check, if $DST is not directory, prevent renaming (cherry picked from commit 27877254f1ef646de0a4050898b3bd2a09159cac) Conflicts: src/datastore_mad/remotes/vmware/cp --- src/datastore_mad/remotes/vmware/cp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datastore_mad/remotes/vmware/cp b/src/datastore_mad/remotes/vmware/cp index 98801a44dd..192385c5ab 100755 --- a/src/datastore_mad/remotes/vmware/cp +++ b/src/datastore_mad/remotes/vmware/cp @@ -102,7 +102,7 @@ http://*|https://* ) ;; esac -if [ ! -f $DST/disk.vmdk ]; then +if [ -d "$DST" -a ! -f "$DST/disk.vmdk" ]; then BASE_DISK_FILE=`ls $SRC | grep '\.vmdk$' | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'`