Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2014-06-18 22:04:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2014-04-30 15:00:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2014-06-18 22:04:34.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jun 4 08:34:09 UTC 2014 - wer...@suse.de + +- Enable service script to return LSB status exit values (bnc#880103) + +------------------------------------------------------------------- +Fri May 9 10:22:17 UTC 2014 - r...@suse.de + +- fix error message if zsh sources xdg-environment.sh if some pathes do not exist (bnc#875118) + +------------------------------------------------------------------- Old: ---- aaa_base-13.2+git20140416.19ef0a1.tar.xz New: ---- aaa_base-13.2+git20140604.9f4be6e.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.AGQVnp/_old 2014-06-18 22:04:35.000000000 +0200 +++ /var/tmp/diff_new_pack.AGQVnp/_new 2014-06-18 22:04:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: aaa_base -Version: 13.2+git20140416.19ef0a1 +Version: 13.2+git20140604.9f4be6e Release: 0 Url: https://github.com/openSUSE/aaa_base Provides: aaa_skel = %{version}-%{release} ++++++ aaa_base-13.2+git20140416.19ef0a1.tar.xz -> aaa_base-13.2+git20140604.9f4be6e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20140416.19ef0a1/files/etc/profile.d/xdg-environment.sh new/aaa_base-13.2+git20140604.9f4be6e/files/etc/profile.d/xdg-environment.sh --- old/aaa_base-13.2+git20140416.19ef0a1/files/etc/profile.d/xdg-environment.sh 2014-04-16 15:07:48.000000000 +0200 +++ new/aaa_base-13.2+git20140604.9f4be6e/files/etc/profile.d/xdg-environment.sh 2014-06-04 10:32:49.000000000 +0200 @@ -21,30 +21,37 @@ unset _y _x } -for xdgdir in /usr/local/share /usr/share /etc/opt/*/share /opt/*/share /usr/share/gnome ; do - if test -d "$xdgdir" && test -d "$xdgdir/applications"; then - if test -z "$XDG_DATA_DIRS"; then - XDG_DATA_DIRS="$xdgdir" - else - XDG_DATA_DIRS="$XDG_DATA_DIRS:$xdgdir" - fi - fi -done - -XDG_DATA_DIRS=$(uniquefy_search_path "$XDG_DATA_DIRS") -export XDG_DATA_DIRS - -for xdgdir in /usr/local/etc/xdg /etc/xdg /etc/opt/*/xdg ; do - if test -d "$xdgdir"; then - if test -z "$XDG_CONFIG_DIRS"; then - XDG_CONFIG_DIRS="$xdgdir" - else - XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:$xdgdir" - fi - fi -done - -XDG_CONFIG_DIRS=$(uniquefy_search_path "$XDG_CONFIG_DIRS") -export XDG_CONFIG_DIRS +setup_xdg_paths() { + if [ "x$ZSH_VERSION" != "x" ] ; then + setopt nullglob localoptions + fi + for xdgdir in /usr/local/share /usr/share /etc/opt/*/share /opt/*/share /usr/share/gnome ; do + if test -d "$xdgdir" && test -d "$xdgdir/applications"; then + if test -z "$XDG_DATA_DIRS"; then + XDG_DATA_DIRS="$xdgdir" + else + XDG_DATA_DIRS="$XDG_DATA_DIRS:$xdgdir" + fi + fi + done + + XDG_DATA_DIRS=$(uniquefy_search_path "$XDG_DATA_DIRS") + export XDG_DATA_DIRS + + for xdgdir in /usr/local/etc/xdg /etc/xdg /etc/opt/*/xdg ; do + if test -d "$xdgdir"; then + if test -z "$XDG_CONFIG_DIRS"; then + XDG_CONFIG_DIRS="$xdgdir" + else + XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:$xdgdir" + fi + fi + done + + XDG_CONFIG_DIRS=$(uniquefy_search_path "$XDG_CONFIG_DIRS") + export XDG_CONFIG_DIRS + + unset xdgdir +} -unset xdgdir +setup_xdg_paths diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base-13.2+git20140416.19ef0a1/files/usr/sbin/service new/aaa_base-13.2+git20140604.9f4be6e/files/usr/sbin/service --- old/aaa_base-13.2+git20140416.19ef0a1/files/usr/sbin/service 2014-04-16 15:07:48.000000000 +0200 +++ new/aaa_base-13.2+git20140604.9f4be6e/files/usr/sbin/service 2014-06-04 10:32:49.000000000 +0200 @@ -67,25 +67,37 @@ exec_rc () { local rc='' + local -i ret if sd_booted && test -z "$SYSTEMD_NO_WRAP"; then if is_systemd_action "$2"; then if is_service "$1"; then daemon_reload "$1.service" systemctl "$2" "$1.service" - return "$?" + ret=$? + if [ "$2" = status ]; then + systemctl is-active "$1.service" > /dev/null 2>&1 + ret=$? + fi + return $ret elif is_target "$1"; then daemon_reload "$1.target" systemctl "$2" "$1.target" - local ret="$?" - if [ "$ret" -eq 0 -a "$2" = "status" ]; then + ret=$? + if [ $ret -eq 0 -a "$2" = "status" ]; then local l=$(systemctl show -p ConsistsOf $1.target 2>/dev/null) local s + systemctl is-active "$1.target" > /dev/null 2>&1 + ret=$? + test $ret -ne 0 && return $ret for s in ${l#ConsistsOf=} ; do echo systemctl status "$s" + systemctl is-active "$s" > /dev/null 2>&1 + ret=$? + test $ret -ne 0 && return $ret done fi - return "$ret" + return $ret fi echo "$1 is neither service nor target!?" >&2 return "1" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
