Skip to content

Commit

Permalink
templates: lxc-opensuse, use rpm to determine build version
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Slaby authored and stgraber committed Aug 13, 2015
1 parent 4d7ca2e commit 05698d7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion templates/lxc-opensuse.in
Expand Up @@ -421,7 +421,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
Expand Down

0 comments on commit 05698d7

Please sign in to comment.