From e7054fafe113bc38fdd941bf6982defc6c880b45 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 19 Jul 2016 17:42:09 +0200 Subject: [PATCH] bug #4602: simplify if statements By: EOLE Team --- src/vmm_mad/remotes/kvm/prereconfigure | 2 +- src/vmm_mad/remotes/kvm/reconfigure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/kvm/prereconfigure b/src/vmm_mad/remotes/kvm/prereconfigure index 3276251d48..f4ecf213cc 100755 --- a/src/vmm_mad/remotes/kvm/prereconfigure +++ b/src/vmm_mad/remotes/kvm/prereconfigure @@ -22,7 +22,7 @@ source $(dirname $0)/../../scripts_common.sh DOMAIN=$1 TARGET_DEVICE=$2 -if [[ ! -z "$DOMAIN" ]] && [[ ! -z "$TARGET_DEVICE" ]] +if [[ -n "$DOMAIN" ]] && [[ -n "$TARGET_DEVICE" ]] then CMD="virsh --connect $LIBVIRT_URI change-media $DOMAIN $TARGET_DEVICE \ --eject --force" diff --git a/src/vmm_mad/remotes/kvm/reconfigure b/src/vmm_mad/remotes/kvm/reconfigure index aaeab05a09..a390966420 100755 --- a/src/vmm_mad/remotes/kvm/reconfigure +++ b/src/vmm_mad/remotes/kvm/reconfigure @@ -23,7 +23,7 @@ DOMAIN=$1 TARGET_DEVICE=$2 ISO_PATH=$3 -if [[ ! -z "$DOMAIN" ]] && [[ ! -z "$TARGET_DEVICE" ]] && [[ ! -z "$ISO_PATH" ]] +if [[ -n "$DOMAIN" ]] && [[ -n "$TARGET_DEVICE" ]] && [[ -n "$ISO_PATH" ]] then CMD="virsh --connect $LIBVIRT_URI \ change-media $DOMAIN $TARGET_DEVICE $ISO_PATH --insert"