From 4a591c2fb0115e383a69eae02f68fc60091277ef Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Wed, 6 Mar 2013 14:50:43 +0100 Subject: [PATCH] Bug #1794: Make vmfs/cp and vmware/cp more robust (cherry picked from commit 3193a4b8df2504606f4b3b1116edf5323e359171) Conflicts: src/datastore_mad/remotes/vmware/cp --- src/datastore_mad/remotes/vmfs/cp | 2 +- src/datastore_mad/remotes/vmware/cp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/datastore_mad/remotes/vmfs/cp b/src/datastore_mad/remotes/vmfs/cp index 3d9895c51c..d90bf48c35 100755 --- a/src/datastore_mad/remotes/vmfs/cp +++ b/src/datastore_mad/remotes/vmfs/cp @@ -133,7 +133,7 @@ esac # Rename the disk filename to disk.vmdk (warning: it does so in SRC) if [ ! -f $SRC/disk.vmdk ]; then - BASE_DISK_FILE=`ls $SRC | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'` + BASE_DISK_FILE=`ls $SRC | grep '\.vmdk$' | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'` exec_and_log "mv -f $SRC/$BASE_DISK_FILE $SRC/disk.vmdk" \ "Error renaming disk file $SRC/$BASE_DISK_FILE to $SRC/disk.vmdk" diff --git a/src/datastore_mad/remotes/vmware/cp b/src/datastore_mad/remotes/vmware/cp index 5964296c5e..0aaf0f6db5 100755 --- a/src/datastore_mad/remotes/vmware/cp +++ b/src/datastore_mad/remotes/vmware/cp @@ -103,7 +103,7 @@ http://*|https://* ) esac if [ -d "$DST" -a ! -f "$DST/disk.vmdk" ]; then - BASE_DISK_FILE=`ls $DST | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'` + BASE_DISK_FILE=`ls $SRC | grep '\.vmdk$' | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'` exec_and_log "mv -f $DST/$BASE_DISK_FILE $DST/disk.vmdk" \