rpms/kerneloops/devel kerneloops-cleanup-logging.patch, NONE, 1.1 kerneloops.spec, 1.8, 1.9

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kerneloops/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21082

Modified Files:
	kerneloops.spec 
Added Files:
	kerneloops-cleanup-logging.patch 
Log Message:
* Fri Mar 28 2008 Chuck Ebbert <cebbert at redhat.com>  0.10-9
- Don't repeatedly ask the user for permission to send old oopses. (#435065)


kerneloops-cleanup-logging.patch:

--- NEW FILE kerneloops-cleanup-logging.patch ---
Write a logfile entry even if nothing gets submitted, so users don't get
asked again about oopses they refused to submit.

Clear the queue when the user answers "never".

Index: kerneloops-0.10/kerneloops.c
===================================================================
--- kerneloops-0.10.orig/kerneloops.c
+++ kerneloops-0.10/kerneloops.c
@@ -77,6 +77,7 @@ static DBusHandlerResult got_message(
 	}
 	if (dbus_message_is_signal(message,
 		"org.kerneloops.submit.permission", "never")) {
+		clear_queue();
 		opted_in = 0;
 		return DBUS_HANDLER_RESULT_HANDLED;
 	}
Index: kerneloops-0.10/submit.c
===================================================================
--- kerneloops-0.10.orig/submit.c
+++ kerneloops-0.10/submit.c
@@ -129,7 +129,12 @@ static void print_queue(void)
 
 }
 
-
+static void write_logfile(int count)
+{
+	openlog("kerneloops", 0, LOG_KERN);
+	syslog(LOG_WARNING, "Submitted %i kernel oopses to www.kerneloops.org", count);
+	closelog();
+}
 
 void submit_queue(void)
 {
@@ -180,11 +185,9 @@ void submit_queue(void)
 		count++;
 	}
 
-	if (count && !testmode) {
-		openlog("kerneloops", 0, LOG_KERN);
-		syslog(LOG_WARNING, "Submitted %i kernel oopses to www.kerneloops.org", count);
-		closelog();
-	}
+	if (count && !testmode)
+		write_logfile(count);
+
 	if (count)
 		dbus_say_thanks();
 	/*
@@ -210,6 +213,7 @@ void clear_queue(void)
 		free(oops);
 		oops = next;
 	}
+	write_logfile(0);
 }
 
 void ask_permission(void)


Index: kerneloops.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kerneloops/devel/kerneloops.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kerneloops.spec	17 Mar 2008 23:01:56 -0000	1.8
+++ kerneloops.spec	28 Mar 2008 17:06:04 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		kerneloops
 Version:	0.10
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	Tool to automatically collect and submit kernel crash signatures
 
 Group:		System Environment/Base
@@ -12,6 +12,7 @@
 Patch2:		kerneloops-require-syslog-on-shutdown.patch
 Patch3:		kerneloops-performance.patch
 Patch4:		kerneloops-ignore-raid-warning.patch
+Patch5:		kerneloops-cleanup-logging.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -37,6 +38,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -77,6 +79,9 @@
 %doc %{_mandir}/man8/kerneloops.8.gz
 
 %changelog
+* Fri Mar 28 2008 Chuck Ebbert <cebbert at redhat.com>  0.10-9
+- Don't repeatedly ask the user for permission to send old oopses. (#435065)
+
 * Mon Mar 17 2008 Chuck Ebbert <cebbert at redhat.com>  0.10-8
 - Don't report a harmless RAID warning message (#437854)