From 03f04297881ee83a1cbf409033f53ba9e51f5aea089150ee576f4a7f75efff00 Mon Sep 17 00:00:00 2001 From: Benjamin Brunner Date: Fri, 23 Mar 2018 11:33:28 +0000 Subject: [PATCH] Accepting request 590622 from home:RBrownSUSE:branches:devel:openSUSE:Factory - Make broken fail consistantly regardless of product OBS-URL: https://build.opensuse.org/request/show/590622 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/update-test-trivial?expand=0&rev=8 --- 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 2cebe3e..45abd0d 100644 --- a/update-test-trivial.changes +++ b/update-test-trivial.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 23 11:03:55 UTC 2018 - rbrown@suse.com + +- Make broken fail consistantly regardless of product + ------------------------------------------------------------------- Thu Feb 8 15:37:23 UTC 2018 - mkravec@suse.com diff --git a/update-test-trivial.spec b/update-test-trivial.spec index 9648c77..3cfa3f8 100644 --- a/update-test-trivial.spec +++ b/update-test-trivial.spec @@ -20,7 +20,7 @@ Name: update-test-trivial Version: 5 Release: 0 Summary: Package for testing the update stack during product development -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/YaST Source0: %{name}.tar.bz2 Source1: baselibs.conf @@ -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)" =~ -(CaaS-Platform|Tumbleweed-Kubic)- ]]; then + if [ ! -f /.buildenv ]; then sed -i -e 's,foo\t,bar\t,g' /some/none/existing/file fi fi