From 1ec174c89815030d7511e53a0c94ed21103ddf2d Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 24 Jan 2013 17:59:45 +0000 Subject: [PATCH] Correct error in empty image cache check. Fixes bug 1104249. * devstack-vm-gate-wrap.sh: The check for cached images should not error when it finds more than one. Change-Id: I4c2eecaeaa2eec51f7ba18997d686a955bd0710d --- devstack-vm-gate-wrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 642c8041..1cd7c238 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -170,7 +170,7 @@ function setup_workspace { # The vm template update job should cache some images in ~/files. # Move them to where devstack expects: - if [ -e ~/cache/files/* ]; then + if [ "$(ls ~/cache/files/* 2>/dev/null)" ]; then rsync -a ~/cache/files/ $DEST/devstack/files/ fi