Bug #1174: Fine tune of the tests

(cherry picked from commit e67523aa2e)
This commit is contained in:
Jaime Melis committed 2012-04-04 13:36:22 +02:00
1 parent 6bf554d4e0
commit 3c000bbcf1
3 files changed
+7 -3

No files matched your search

+3 -1
View File
@@ -50,9 +50,11 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
SRC="${XPATH_ELEMENTS[0]}"
BASE_PATH="${XPATH_ELEMENTS[1]}"
BASENAME_SRC=`basename "${SRC##$BASE_PATH}"`
# ------------ Remove the image from the repository ------------
if [ -f "$SRC" -a `dirname "$SRC"` = "$BASE_PATH" -a -n `basename "$SRC"` ]
if [ -f "$SRC" -a `dirname "$SRC"` = "$BASE_PATH" -a -n "$BASENAME_SRC" ]
then
log "Removing $SRC from the image repository"
+1 -1
View File
@@ -75,7 +75,7 @@ EOF
IMAGE_HASH=$(echo $CANONICAL_MD5 | cut -d ' ' -f1)
IMAGE_HASH=$(basename "$IMAGE_HASH")
if [ -z "$IMAGE_HASH" ]; then
if [ -z "$IMAGE_HASH" -o -z "$BASE_PATH" ]; then
log_error "Error generating the path in generate_image_path."
exit 1
fi
+3 -1
View File
@@ -50,9 +50,11 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
SRC="${XPATH_ELEMENTS[0]}"
BASE_PATH="${XPATH_ELEMENTS[1]}"
BASENAME_SRC=`basename "${SRC##$BASE_PATH}"`
# ------------ Remove the image from the repository ------------
if [ -d "$SRC" -a `dirname "$SRC"` = "$BASE_PATH" -a -n `basename "$SRC"` ]
if [ -d "$SRC" -a `dirname "$SRC"` = "$BASE_PATH" -a -n "$BASENAME_SRC" ]
then
log "Removing $SRC from the image repository"