From 46094474d5da5c5e3f4b1e4ee2a1f472f8421ea18e137d034ac5c880281222ba Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Sat, 27 Dec 2014 23:27:33 +0000 Subject: [PATCH] Accepting request 266543 from home:Ledest:bashisms fix bashisms in libvirt-guests.sh script OBS-URL: https://build.opensuse.org/request/show/266543 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=430 --- libvirt-guests-init-script.patch | 12 +++++++----- libvirt.changes | 7 +++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch index 96b7c70..cfbfae7 100644 --- a/libvirt-guests-init-script.patch +++ b/libvirt-guests-init-script.patch @@ -74,7 +74,7 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in return 1 else return 0 -@@ -83,6 +84,25 @@ run_virsh_c() { +@@ -83,6 +84,26 @@ run_virsh_c() { ( export LC_ALL=C; run_virsh "$@" ) } @@ -91,8 +91,9 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in + run_virsh $uri list > /dev/null 2>&1 + done + if [ $i -eq $rets ]; then -+ echo $"libvirt-guests unable to connect to URI: $uri" -+ return 1 ++ eval_gettext "libvirt-guests unable to connect to URI: $uri" ++ echo ++ return 1 + fi + return 0 +} @@ -118,13 +119,14 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in return 1 fi -@@ -190,6 +210,12 @@ start() { +@@ -190,6 +210,13 @@ start() { test_connect "$uri" || continue + await_daemon_up $uri + if [ $? -ne 0 ]; then -+ echo $"Ignoring guests on $uri URI, can't connect" ++ eval_gettext "Ignoring guests on $uri URI, can't connect" ++ echo + continue + fi + diff --git a/libvirt.changes b/libvirt.changes index 61ea7e1..8bcc3dc 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 27 22:08:00 UTC 2014 - Led + +- fix bashisms in libvirt-guests.sh script +- update patches: + + libvirt-guests-init-script.patch + ------------------------------------------------------------------- Mon Dec 15 09:48:02 UTC 2014 - cbosdonnat@suse.com