rpms/bug-buddy/FC-6 bug-buddy-2.16.0-sysinfo.patch, 1.1, 1.2 bug-buddy.spec, 1.65, 1.66

Wed Jan 31 19:45:37 UTC 2007

Author: rstrode

Update of /cvs/dist/rpms/bug-buddy/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11787

Modified Files:
	bug-buddy-2.16.0-sysinfo.patch bug-buddy.spec 
Log Message:
- update extra-info patch to limit the number of lines of
  output (Patch by Alex, reported by fer, pulled from upstream)
  (bug 226001)


bug-buddy-2.16.0-sysinfo.patch:
 bug-buddy.c |  142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 141 insertions(+), 1 deletion(-)

Index: bug-buddy-2.16.0-sysinfo.patch
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/FC-6/bug-buddy-2.16.0-sysinfo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- bug-buddy-2.16.0-sysinfo.patch	1 Nov 2006 10:29:13 -0000	1.1
+++ bug-buddy-2.16.0-sysinfo.patch	31 Jan 2007 19:45:35 -0000	1.2
@@ -1,10 +1,10 @@
 Index: src/bug-buddy.c
 ===================================================================
 RCS file: /cvs/gnome/bug-buddy/src/bug-buddy.c,v
-retrieving revision 1.139
-diff -u -p -r1.139 bug-buddy.c
---- src/bug-buddy.c	4 Sep 2006 21:02:13 -0000	1.139
-+++ src/bug-buddy.c	17 Oct 2006 13:40:35 -0000
+retrieving revision 1.140
+diff -u -p -r1.140 bug-buddy.c
+--- src/bug-buddy.c	25 Oct 2006 23:36:31 -0000	1.140
++++ src/bug-buddy.c	9 Nov 2006 10:56:21 -0000
 @@ -31,6 +31,9 @@
  #include <stdio.h>
  #include <unistd.h>
@@ -32,7 +32,34 @@
  
  static GOptionData gopt_data;
  static int bug_count = 0;
-@@ -1054,6 +1058,104 @@ fill_include_file (char *filename, Glade
+@@ -89,6 +93,8 @@ enum {
+ 	NETWORK_UNKNOWN
+ };
+ 
++static void fill_stderr_info (GladeXML *xml);
++
+ 
+ static void
+ buddy_error (GtkWidget *parent, const char *msg, ...)
+@@ -784,6 +790,8 @@ known_app_finished (GladeXML *xml)
+ {
+ 	GtkWidget *email_entry;
+ 	char *default_email;
++
++	fill_stderr_info (xml);
+ 	
+ 	gtk_widget_show (glade_xml_get_widget (xml, "final-box"));
+ 	gtk_widget_show (glade_xml_get_widget (xml, "send-button"));
+@@ -894,6 +902,8 @@ unknown_app_finished (GladeXML *xml)
+ {
+ 	GtkWidget *button;
+ 
++	fill_stderr_info (xml);
++	
+ 	/* don't need user input, so hide these widgets */
+ 	gtk_widget_hide (glade_xml_get_widget (xml, "final-box"));
+ 	gtk_widget_hide (glade_xml_get_widget (xml, "progressbar"));
+@@ -1054,6 +1064,134 @@ fill_include_file (char *filename, Glade
  }
  
  
@@ -45,10 +72,8 @@
 +	GtkTextBuffer *buffer;
 +	GString *system_info;
 +	struct utsname uts_buf;
-+	char *str, *file;
++	char *str;
 +	gboolean has_selinux, enforcing, a11y;
-+	gchar **lines;
-+	int n_lines, i;
 +	
 +	g_return_if_fail (xml != NULL);
 +	
@@ -85,14 +110,40 @@
 +	g_object_unref (gconf_client);
 +	g_string_append_printf (system_info, "Accessibility: %s\n", a11y?"Enabled":"Disabled");
 +
++	g_string_append (system_info, "\n");
++	
++	text_view = GTK_TEXT_VIEW (glade_xml_get_widget (xml, "gdb-text"));
++	buffer = gtk_text_view_get_buffer (text_view);
++	gtk_text_buffer_get_end_iter (buffer, &end);
++	gtk_text_buffer_insert (buffer, &end, system_info->str, system_info->len);
++
++	g_string_free (system_info, TRUE);
++}
++
++static void
++fill_stderr_info (GladeXML *xml)
++{
++	GtkTextView *text_view;
++	GtkTextIter end;
++	GtkTextBuffer *buffer;
++	GString *stderr_info;
++	char *str, *file;
++	gchar **lines;
++	int n_lines, i;
++	
++	g_return_if_fail (xml != NULL);
++	
++	stderr_info = g_string_new ("");
++
 +	/* .xsession-errors: read file */
 +	file = g_build_filename (g_get_home_dir (), ".xsession-errors", NULL);
 +	if (g_file_get_contents (file, &str, NULL, NULL)) {
 +		lines = g_strsplit (str, "\n", -1);
 +		g_free (str);
 +		n_lines = 0;
-+		while (lines[n_lines] != NULL)
++		while (lines[n_lines] != NULL) {
 +			n_lines++;
++		}
 +
 +		if (n_lines > 0) {
 +			struct stat buf;
@@ -107,37 +158,43 @@
 +				}
 +			}
 +				
-+			g_string_append_printf (system_info,
-+						"----------- .xsession-errors%s ---------------------\n",
++			g_string_append_printf (stderr_info,
++						"\n\n----------- .xsession-errors%s ---------------------\n",
 +						mtime_age?mtime_age:"");
 +			g_free (mtime_age);
 +		}
 +			
 +		for (i = MAX (0, n_lines-16); i < n_lines; i++) {
-+			if (lines[i][0] != 0)
-+				g_string_append_printf (system_info, "%s\n", lines[i]);
++			if (lines[i][0] != 0) {
++				/* Limit line length to 200 chars to avoid excessive data */
++				if (strlen (lines[i]) > 200) {
++					lines[i][200] = 0;
++				}
++				
++				g_string_append_printf (stderr_info, "%s\n", lines[i]);
++			}
 +		}
 +		if (n_lines > 0)
-+			g_string_append (system_info, "--------------------------------------------------\n");
++			g_string_append (stderr_info, "--------------------------------------------------\n");
 +		
 +		g_strfreev (lines);
 +	}
 +	g_free (file);
 +
-+	g_string_append (system_info, "\n");
-+	
 +	text_view = GTK_TEXT_VIEW (glade_xml_get_widget (xml, "gdb-text"));
 +	buffer = gtk_text_view_get_buffer (text_view);
 +	gtk_text_buffer_get_end_iter (buffer, &end);
-+	gtk_text_buffer_insert (buffer, &end, system_info->str, system_info->len);
-+
-+	g_string_free (system_info, TRUE);
++	gtk_text_buffer_insert (buffer, &end, stderr_info->str, stderr_info->len);
++	
++	g_string_free (stderr_info, TRUE);
 +}
 +
++
++
  
  int
  main (int argc, char *argv[])
-@@ -1174,6 +1276,8 @@ main (int argc, char *argv[])
+@@ -1174,6 +1312,8 @@ main (int argc, char *argv[])
  		gtk_statusbar_push (GTK_STATUSBAR (statusbar),
  			    	    DEBUGGING, _("Collecting info from the crash..."));
  


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/FC-6/bug-buddy.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- bug-buddy.spec	1 Nov 2006 10:29:13 -0000	1.65
+++ bug-buddy.spec	31 Jan 2007 19:45:35 -0000	1.66
@@ -6,7 +6,7 @@
 
 Name: bug-buddy
 Version: 2.16.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Summary: A bug reporting utility for GNOME
 License: GPL
@@ -132,6 +132,11 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Wed Jan 31 2007 Ray Strode <rstrode at redhat.com> - 1:2.16.0-4
+- update extra-info patch to limit the number of lines of
+  output (Patch by Alex, reported by fer, pulled from upstream)
+  (bug 226001)
+
 * Wed Nov  1 2006 Alexander Larsson <alexl at redhat.com> - 1:2.16.0-3
 - Add extra information to autogenerated bug reports
 


