File templates-lxc-opensuse-use-rpm-to-determine-bui... of Package lxc

Overview Repositories Revisions Requests Users Attributes Meta

File templates-lxc-opensuse-use-rpm-to-determine-build-ve.patch of Package lxc (Revision f44f3683c54d9c729c3d5db87edefb39)

Currently displaying revision f44f3683c54d9c729c3d5db87edefb39 , Show latest

From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 5 Aug 2015 10:32:54 +0200
Subject: templates: lxc-opensuse, use rpm to determine build version
Patch-mainline: yes
Git-commit: fe89217a880dafc8da0357fa1444e24d0bf9f202

zypper info's output is not usable for several reasons:
* it is localized -- there is no "Version: " in my output
* it shows results both from the repo and local system

So use plain rpm to determine whether build is installed and if proper
version is in place.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 templates/lxc-opensuse.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index 7c0a40ee2cb1..45b072c68c60 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -422,7 +422,8 @@ if [ -z "$path" ]; then
 fi
 
 if grep -q Harlequin /etc/os-release || grep -q Tumbleweed /etc/os-release ; then
-    if [[ "$(zypper info build|awk -F "[- ]" '/Version/ {print $2}')" -lt "20141120" ]] ; then
+    BVER=`rpm -q --qf '%{version}\n' build`
+    if [ $? -ne 0 -o "$BVER" -lt "20141120" ]; then
 	echo "Building openSUSE containers with your version of the build package is broken. Please install the update to version 20141120 or newer."
 	exit 1
     fi
-- 
2.5.0

Places

File templates-lxc-opensuse-use-rpm-to-determine-build-ve.patch of Package lxc (Revision f44f3683c54d9c729c3d5db87edefb39)

Places