Skip to content

Commit

Permalink
Install the patches for all selected categories (bsc#1044018)
Browse files Browse the repository at this point in the history
(not just the first one)

- Properly handle the exist status for multiple categories
- 3.1.6
  • Loading branch information
lslezak committed Jun 30, 2017
1 parent 7fe7486 commit 71160a3
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions package/yast2-online-update-configuration.changes
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-online-update-configuration.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-online-update-configuration
Version: 3.1.5
Version: 3.1.6
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down
10 changes: 7 additions & 3 deletions src/bin/online_update
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function runzypper {
"$@"
status=$?
fi
exit $status
return $status
}

# trim whitespaces
Expand All @@ -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

0 comments on commit 71160a3

Please sign in to comment.