From 48a89c30f33794cc59f42462cbfeb437f1bd9eb412be9fe30aec99f315c1ebfd Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 16 Feb 2018 14:38:25 +0000 Subject: [PATCH] Accepting request 574543 from home:mkravec:branches:devel:openSUSE:Factory - Fix broken subpackage failing condition for Kubic OBS-URL: https://build.opensuse.org/request/show/574543 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/update-test-trivial?expand=0&rev=6 --- update-test-trivial.changes | 5 +++++ update-test-trivial.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/update-test-trivial.changes b/update-test-trivial.changes index 6111e30..2cebe3e 100644 --- a/update-test-trivial.changes +++ b/update-test-trivial.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 8 15:37:23 UTC 2018 - mkravec@suse.com + +- Fix broken subpackage failing condition for Kubic + ------------------------------------------------------------------- Wed Dec 20 14:45:28 UTC 2017 - bbrunner@suse.com diff --git a/update-test-trivial.spec b/update-test-trivial.spec index a252380..9648c77 100644 --- a/update-test-trivial.spec +++ b/update-test-trivial.spec @@ -1,7 +1,7 @@ # # spec file for package update-test-trivial # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -134,7 +134,7 @@ An update for this package should fail. %pre -n update-test-broken if [ $1 -ne 1 ]; then - if [[ "$(cat /etc/YaST2/build)" == *"SUSE-CaaS-Platform-"* ]]; then + if [[ "$(cat /etc/YaST2/build)" =~ -(CaaS-Platform|Tumbleweed-Kubic)- ]]; then sed -i -e 's,foo\t,bar\t,g' /some/none/existing/file fi fi