From 71160a38f6dd2d1aaba620bcf6176ee28c030fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= <lslezak@suse.cz>
Date: Fri, 30 Jun 2017 13:34:03 +0200
Subject: [PATCH] Install the patches for all selected categories (bsc#1044018)

(not just the first one)

- Properly handle the exist status for multiple categories
- 3.1.6
---
 .travis.yml                                       |  2 +-
 package/yast2-online-update-configuration.changes |  8 ++++++++
 package/yast2-online-update-configuration.spec    |  2 +-
 src/bin/online_update                             | 10 +++++++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5889faa..c8e382a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ before_install:
     # disable rvm, use system Ruby
     - rvm reset
     - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-packager" -g "rspec:3.3.0 yast-rake gettext"
+    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-packager gettext" -g "rspec:3.3.0 yast-rake gettext"
 script:
     - rake check:syntax
     - rake check:pot
diff --git a/package/yast2-online-update-configuration.changes b/package/yast2-online-update-configuration.changes
index 3213b19..90dca14 100644
--- a/package/yast2-online-update-configuration.changes
+++ b/package/yast2-online-update-configuration.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun 30 11:30:17 UTC 2017 - lslezak@suse.cz
+
+- Install the patches for all selected categories (not just the
+  first one) (bsc#1044018)
+- Properly handle the exist status for multiple categories
+- 3.1.6
+
 -------------------------------------------------------------------
 Wed Apr 16 13:29:46 UTC 2014 - lslezak@suse.cz
 
diff --git a/package/yast2-online-update-configuration.spec b/package/yast2-online-update-configuration.spec
index b817348..0a5ba46 100644
--- a/package/yast2-online-update-configuration.spec
+++ b/package/yast2-online-update-configuration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-online-update-configuration
-Version:        3.1.5
+Version:        3.1.6
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/src/bin/online_update b/src/bin/online_update
index dc5a3bb..e7dca1a 100755
--- a/src/bin/online_update
+++ b/src/bin/online_update
@@ -59,7 +59,7 @@ function runzypper {
         "$@"
         status=$?
     fi
-    exit $status
+    return $status
 }
 
 # trim whitespaces
@@ -68,8 +68,12 @@ AOU_PATCH_CATEGORIES=`echo $AOU_PATCH_CATEGORIES`
 if [ -z "$AOU_PATCH_CATEGORIES" ] ; then
   runzypper $zcmd
 else
+  # handle errors for multiple categories
+  ret=0
+
   for cat in $AOU_PATCH_CATEGORIES ; do
-    runzypper $zcmd --category "$cat"
+    runzypper $zcmd --category "$cat" || ret=$?
   done
-fi
 
+  exit $ret
+fi