Merge branch 'master' into rhel6

7 files changed, 27 insertions, 13 deletions

diff --git a/abrt.init b/abrt.init
index 6256767..c286c64 100644
--- a/abrt.init
+++ b/abrt.init
@@ -11,7 +11,7 @@
 # Default-Stop: 0 1 2 6
 # Default-Start: 3 5
 # Short-Description: start and stop abrt daemon
-# Description: Listen and dispatch crash events
+# Description: Listen to and dispatch crash events
 ### END INIT INFO
 
 # Source function library.
@@ -21,12 +21,18 @@ LOCK="/var/lock/subsys/abrtd"
 RETVAL=0
 
 #
+# Set these variables if you are behind proxy
+#
+#export http_proxy=
+#export https_proxy=
+
+#
 # See how we were called.
 #
 
 check() {
 	# Check that we're a privileged user
-	[ `id -u` = 0 ] || exit 4
+	[ "`id -u`" = 0 ] || exit 4
 
 	# Check if abrt is executable
 	test -x $ABRT_BIN || exit 5
diff --git a/doc/HOW_TO_TEST b/doc/HOW_TO_TEST
index d11c6d8..8e63c36 100644
--- a/doc/HOW_TO_TEST
+++ b/doc/HOW_TO_TEST
@@ -4,7 +4,9 @@ I. Build and install
 ===================
 a) build the packages as scratch in koji
 b) download and install (the best is to create a local repo and try to install it using yum)
-c) start the daemon and check logs for any sign of a problem
+c) create a repository and try to update from previous packages
+d) start the daemon and check logs for any sign of a problem
+e) try to update from previous Fedora version using created repository
 
 II. Crash detection
 =====================
@@ -29,4 +31,5 @@ III. Reporting
         - crash should be reported  after filling the right credentials
         - login+pass won't be saved
     c) try to report every supported crash abrt detects C/C++, oops, python script
-    d) repeat this with cli
+    d) try to report some crash with bad backtrace - this should fail
+    e) repeat this with cli
diff --git a/inc/CrashTypes.h b/inc/CrashTypes.h
index b14413d..af106cf 100644
--- a/inc/CrashTypes.h
+++ b/inc/CrashTypes.h
@@ -26,9 +26,6 @@
 #define FILENAME_KERNEL       "kernel"
 #define FILENAME_TIME         "time"
 #define FILENAME_UID          "uid"
-// uuid _file_ exists for Python analyzer only - remove, follow ccpp's example?
-// (ccpp keeps uuid in DB)
-#define FILENAME_UUID         "uuid"
 #define FILENAME_PACKAGE      "package"
 #define FILENAME_COMPONENT    "component"
 #define FILENAME_DESCRIPTION  "description"
diff --git a/lib/Utils/make_descr.cpp b/lib/Utils/make_descr.cpp
index c2821a5..6a1deda 100644
--- a/lib/Utils/make_descr.cpp
+++ b/lib/Utils/make_descr.cpp
@@ -71,7 +71,6 @@ static void add_content(bool &was_multiline, string& description, const char *he
 static const char *const blacklisted_items_bz[] = {
     FILENAME_TIME     ,
     FILENAME_UID      ,
-    FILENAME_UUID     ,
     FILENAME_ANALYZER ,
     FILENAME_COREDUMP ,
     FILENAME_DESCRIPTION, /* package description - basically useless */
diff --git a/src/Backtrace/abrt-bz-dupchecker b/src/Backtrace/abrt-bz-dupchecker
index cbdafc5..cb11bf1 100755
--- a/src/Backtrace/abrt-bz-dupchecker
+++ b/src/Backtrace/abrt-bz-dupchecker
@@ -25,6 +25,8 @@ import sys
 import os.path
 import subprocess
 import cPickle
+import urllib
+import json
 
 parser = OptionParser(version="%prog 1.0")
 parser.add_option("-u", "--user", dest="user",
@@ -87,6 +89,7 @@ for buginfo in buginfos:
 
   if ids.has_key(buginfo.bug_id):
     continue
+
   ids[buginfo.bug_id] = True
 
   if not buginfo.bug_status in ["NEW", "ASSIGNED", "MODIFIED", "VERIFIED"]:
@@ -177,9 +180,17 @@ print "------------------------------"
 for backtrace, components in database.items():
   for component, bugitems in components.items():
     if len(bugitems) > 1:
+       # Get the component owner
+      component_info = json.load(urllib.urlopen("https://admin.fedoraproject.org/pkgdb/packages/name/{0}?tg_format=json".format(buginfo.component)))
+      component_packages = component_info['packageListings']
+      component_f12 = filter(lambda x:x["collection"]["version"]=="12", component_packages)
+      owner = "Failed to get component owner"
+      if len(component_f12) == 1:
+        owner = component_f12["owner"]
+
       if options.wiki:
         print "----"
-        print "* component: '''{0}'''".format(component)
+        print "* component: '''{0}''' ({1})".format(component, owner)
         print "* duplicates: {0}".format(
           reduce(lambda x,y: x+", "+y, 
                  map(lambda x: "#[https://bugzilla.redhat.com/show_bug.cgi?id={0} {0}] ({1} comments)".format(x['id'],x['comments']), 
@@ -188,7 +199,7 @@ for backtrace, components in database.items():
         for line in backtrace.replace("Thread\n", "").splitlines():
           print "*# {0}".format(line)
       else:
-        print "Component: {0}".format(component)
+        print "Component: {0} ({1})".format(component, owner)
         print "Duplicates: {0}".format(
           reduce(lambda x,y: x+", "+y, 
                  map(lambda x: "{0} ({1})".format(x['id'],x['comments']), 
diff --git a/src/Gui/PluginsSettingsDialog.py b/src/Gui/PluginsSettingsDialog.py
index 0ba390d..d6129b1 100644
--- a/src/Gui/PluginsSettingsDialog.py
+++ b/src/Gui/PluginsSettingsDialog.py
@@ -141,7 +141,7 @@ class PluginsSettingsDialog:
     def on_bConfigurePlugin_clicked(self, button, pluginview):
         pluginsListStore, path = pluginview.get_selection().get_selected_rows()
         if not path:
-            self.builder.get_object("lDescription").set_label(_("Can't get plugin description"))
+            gui_info_dialog(_("Please select a plugin from the list to edit it's options."), self.window)
             return
         # this should work until we keep the row object in the last position
         pluginfo = pluginsListStore.get_value(pluginsListStore.get_iter(path[0]), pluginsListStore.get_n_columns()-1)
diff --git a/src/Gui/ccgui.glade b/src/Gui/ccgui.glade
index 78e5fd9..0b51334 100644
--- a/src/Gui/ccgui.glade
+++ b/src/Gui/ccgui.glade
@@ -207,7 +207,6 @@ Patrick Connelly &lt;pcon@fedoraproject.org&gt;</property>
         <child>
           <widget class="GtkToolbar" id="toolbar1">
             <property name="visible">True</property>
-            <property name="toolbar_style">both</property>
             <child>
               <widget class="GtkToolButton" id="bDelete">
                 <property name="visible">True</property>
@@ -224,7 +223,6 @@ Patrick Connelly &lt;pcon@fedoraproject.org&gt;</property>
             <child>
               <widget class="GtkToolButton" id="bReport">
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
                 <property name="tooltip" translatable="yes">Report</property>
                 <property name="label" translatable="yes">Report</property>
                 <property name="stock_id">gtk-go-up</property>