Hello community, here is the log from the commit of package apport for openSUSE:Factory checked in at Thu Jun 16 10:46:11 CEST 2011.
-------- --- apport/apport.changes 2010-07-20 15:15:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/apport/apport.changes 2011-06-15 12:47:36.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Jun 15 09:52:01 UTC 2011 - lnus...@suse.de + +- really fix /var/lock/subsys usage +- init script cleanup +- install rcapport symlink +- url for viewing reports should be http + +------------------------------------------------------------------- +Tue Jun 7 19:40:26 UTC 2011 - br...@ioda-net.ch + +- Changing subject of bnc#698213 after mail from speilicke to + /var/lock making it in phase with the patch +- Renamed patch to apport-fix_var_lock_subsys.diff + +------------------------------------------------------------------- +Mon Jun 6 11:24:22 UTC 2011 - br...@ioda-net.ch + +- Fix init script to get rid of /var/run/subsys (bnc#698213) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apport.spec ++++++ --- /var/tmp/diff_new_pack.eAg4Q1/_old 2011-06-16 10:41:53.000000000 +0200 +++ /var/tmp/diff_new_pack.eAg4Q1/_new 2011-06-16 10:41:53.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package apport (Version 0.114) +# spec file for package apport # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007-2008 Nikolay Derkach <nderk...@gmail.com> # # All modifications and additions to the file contributed by third parties @@ -23,7 +23,7 @@ Name: apport Summary: Automatic crash handler Version: 0.114 -Release: 20 +Release: 24 License: GPLv2+ Url: https://launchpad.net/apport BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -115,6 +115,8 @@ # install init script %__install -d -m755 %{buildroot}%{_sysconfdir}/init.d %__install -m755 %SOURCE1 %{buildroot}%{_sysconfdir}/init.d/apport +%__install -d -m755 %{buildroot}%{_sbindir} +ln -s %{_sysconfdir}/init.d/apport %{buildroot}%{_sbindir}/rcapport # install man pages %__install -d -m755 %{buildroot}%{_mandir}/man1 %__install -m644 man/apport-{cli,unpack}.1 %{buildroot}%{_mandir}/man1 @@ -153,6 +155,7 @@ %{_bindir}/apport-cli %{_bindir}/apport-checkreports %{_bindir}/apport-unpack +%{_sbindir}/rcapport %doc doc/data-format.pdf doc/package-hooks.txt %doc %{_mandir}/man1/apport-cli.1* %doc %{_mandir}/man1/apport-unpack.1* ++++++ crashdb.conf ++++++ --- /var/tmp/diff_new_pack.eAg4Q1/_old 2011-06-16 10:41:53.000000000 +0200 +++ /var/tmp/diff_new_pack.eAg4Q1/_new 2011-06-16 10:41:53.000000000 +0200 @@ -7,8 +7,8 @@ 'impl': 'opensuse_crashdb', 'bug_pattern_base': None, 'report_baseurl': 'https://crashdb.opensuse.org/log/new', - 'comment_baseurl': 'https://crashdb.opensuse.org/log/show/%s', - 'comment_rawurl': 'https://crashdb.opensuse.org/log/raw/%s', + 'comment_baseurl': 'http://crashdb.opensuse.org/log/show/%s', + 'comment_rawurl': 'http://crashdb.opensuse.org/log/raw/%s', 'cert_location': '/etc/apport/crashdb.pem', 'distro': 'opensuse' }, ++++++ rc.apport ++++++ --- /var/tmp/diff_new_pack.eAg4Q1/_old 2011-06-16 10:41:53.000000000 +0200 +++ /var/tmp/diff_new_pack.eAg4Q1/_new 2011-06-16 10:41:53.000000000 +0200 @@ -23,12 +23,6 @@ set -o noclobber -# Check for missing binaries (stale symlinks should not happen) -# Note: Special treatment of stop for LSB conformance -[ -x $AGENT ] || { log_failure_msg "$AGENT not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - # Return success if apport is already enabled apport_is_enabled() { grep -q "^|.*apport" $PATFILE @@ -40,9 +34,6 @@ start_apport() { if ! apport_is_enabled; then - [ -e /var/crash ] || { - log_failure_msg "There is /var/crash directory missing in your system"; - exit 2; } cat $PATFILE > $OLDPAT echo "|$AGENT %p %s %c" >| /proc/sys/kernel/core_pattern fi @@ -62,13 +53,11 @@ case "$1" in start) start_apport - touch /var/lock/subsys/apport log_success_msg "Starting $DESC" ;; stop) stop_apport - rm -f /var/lock/subsys/apport log_success_msg "Stopping $DESC" ;; restart|reload) @@ -86,23 +75,22 @@ # 4 - service status unknown :-( # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) - if grep -q 'apport' $PATFILE; then - echo "Apport is enabled" - exit 0 + echo -n "Checking for $DESC ..." + if apport_is_enabled; then + rc_failed 0 else - echo "Apport is disabled" - exit 3 + rc_failed 3 fi rc_status -v ;; try-restart|condrestart) - if [ -f /var/lock/subsys/apport ]; then - $0 stop - $0 start + if apport_is_enabled; then + stop_apport + start_apport fi ;; *) - echo "Usage: $0 {start|stop|status|restart|reload|try-restart|condrestart}" + echo "Usage: $0 {start|stop|status|restart|reload|try-restart}" exit 1 ;; esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
