Merge lp:~cr3/checkbox/1047857 into lp:checkbox

[Marc Tardif]

Merged fix to remove apport plugin by cr3 (LP #1047857)

Remembered to update po/POTFILES.in to remove reference to plugins/apport_prompt.py.

[lp:~cr3/checkbox/1047857]

1715. By Marc Tardif on 2012-09-27

Removed apport_prompt.py from POTFILES.in

[Marc Tardif (cr3)]

The changes to po/POTFILES.in got lost when creating this merge request again.

review: Needs Resubmitting

[Jeff Marcom (jeffmarcom)]

Looks okay to me, and no more nagging from apport!!! Thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-27 09:00:46 +0000
+++ debian/changelog	2012-09-27 16:14:24 +0000
@@ -87,6 +87,8 @@
   * checkbox/parsers/description.py: Fixed the PURPOSE and STEPS parts
     of the description parser to automatically fix bad descriptions.
   * plugins/suites_prompt.py: Fixed tree view in selection window (LP #1056432)
+  * plugins/apport_prompt.py: Removed apport plugin that caused crashes
+    when trying to send bug report (LP #1047857)
 
   [Sean Feole]
   * [FEATURE] scripts/battery_test: measures battery capacity before and after
 
=== removed file 'plugins/apport_prompt.py'
--- plugins/apport_prompt.py	2012-07-27 14:24:06 +0000
+++ plugins/apport_prompt.py	1970-01-01 00:00:00 +0000
@@ -1,280 +0,0 @@
-#
-# This file is part of Checkbox.
-#
-# Copyright 2008 Canonical Ltd.
-#
-# Checkbox is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Checkbox is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
-#
-import logging
-
-from subprocess import check_output
-
-from gettext import gettext as _
-
-from checkbox.job import FAIL
-from checkbox.plugin import Plugin
-from checkbox.properties import Bool, Path, String
-from checkbox.reactor import StopAllException
-
-
-class DummyUserInterface:
-    pass
-
-try:
-    from apport.ui import UserInterface
-    from apport.crashdb import get_crashdb
-except:
-    UserInterface = DummyUserInterface
-
-
-CATEGORY_TO_PACKAGE = {
-    "SOUND": "alsa-base"}
-
-CATEGORY_TO_SYMPTOM = {
-    "VIDEO": "display",
-    "DISK":  "storage"}
-
-
-class ApportOptions:
-
-    def __init__(self, test, device, package, symptom):
-        self.test = test
-        self.device = device
-        self.package = package
-        self.symptom = symptom
-        self.pid = None
-        self.save = False
-        self.tag = '' #Additional tags to add to reports filed
-                      #through this tool
-
-
-class ApportUserInterface(UserInterface):
-
-    def __init__(self, interface, options):
-        self.interface = interface
-        self.options = options
-        self.report = None
-        self.report_file = None
-        self.cur_package = None
-
-        # ImportError raised during package upgrade
-        self.crashdb = get_crashdb(None)
-
-    def ui_info_message(self, title, text):
-        self.interface.show_info(text, ["close"])
-
-    def ui_error_message(self, title, text):
-        self.interface.show_progress_stop()
-        self.interface.show_error(text)
-
-    def ui_start_info_collection_progress(self):
-        self.interface.show_progress_start(
-            _("Collecting information about this test.\n"
-              "This might take a few minutes."))
-
-    def ui_pulse_info_collection_progress(self):
-        self.interface.show_progress_pulse()
-
-    def ui_stop_info_collection_progress(self):
-        # tags
-        if "Tags" in self.report:
-            tags = self.report["Tags"].split(" ")
-        else:
-            tags = []
-
-        tags.append("checkbox-bug")
-        if self.options.device:
-            tags.append(self.options.device)
-
-        self.report["Tags"] = " ".join(tags)
-
-        # checkbox
-        test = self.options.test
-        self.report["CheckboxTest"] = test["name"]
-        if test.get("description"):
-            self.report["CheckboxDescription"] = test["description"]
-        if test.get("data"):
-            self.report["CheckboxData"] = test["data"]
-        if test.get("command"):
-            self.report["CheckboxCommand"] = test["command"]
-        if test.get("environ"):
-            self.report["CheckboxEnvironment"] = test["environ"]
-
-        self.interface.show_progress_stop()
-
-    def ui_start_upload_progress(self):
-        self.interface.show_progress_start(
-            _("Collected information is being sent for bug tracking.\n"
-            "This might take a few minutes."))
-
-    def ui_set_upload_progress(self, progress):
-        self.interface.show_progress_pulse()
-
-    def ui_stop_upload_progress(self):
-        self.interface.show_progress_stop()
-
-    def ui_present_report_details(self, *args):
-        return dict(report=1)
-
-    def ui_question_choice(self, text, options, multiple):
-        self.interface.show_progress_stop()
-
-        if multiple:
-            results = self.interface.show_check(text, options)
-        else:
-            results = [self.interface.show_radio(text, options)]
-
-        return [options.index(r) for r in results]
-
-    def ui_question_yesno(self, text):
-        self.interface.show_progress_stop()
-        result = self.interface.show_radio(text, ["Yes", "No"])
-        return result == "Yes"
-
-    def open_url(self, url):
-        self.interface.show_url(url)
-
-
-class ApportPrompt(Plugin):
-
-    # Default configuration filename
-    default_filename = Path(default="/etc/default/apport")
-
-    # Default enabled state
-    default_enabled = Bool(required=False)
-
-    # Default package if none is detected
-    default_package = String(required=False)
-
-    # Filename where Submission ID is cached
-    submission_filename = Path(default="%(checkbox_data)s/submission")
-
-    # Filename where System ID is cached
-    system_filename = Path(default="%(checkbox_data)s/system")
-
-    def register(self, manager):
-        super(ApportPrompt, self).register(manager)
-
-        self._submission_id = None
-        self._system_id = None
-
-        for (rt, rh) in [
-             ("exchange-success", self.exchange_success),
-             ("report-submission_id", self.report_submission_id),
-             ("report-system_id", self.report_system_id)]:
-            self._manager.reactor.call_on(rt, rh)
-
-        if not isinstance(ApportUserInterface, DummyUserInterface):
-            self._manager.reactor.call_on("gather", self.gather)
-            self._manager.reactor.call_on("prompt-test", self.prompt_test, 100)
-
-    def gather(self):
-        if self.default_enabled is None:
-            value = check_output("unset enabled && . %s && echo ${enabled}"
-                % self.default_filename, shell=True, universal_newlines=True)
-            self.default_enabled = value.strip() == "1"
-
-    def prompt_test(self, interface, test):
-        if not self.default_enabled:
-            return
-
-        if test["status"] != FAIL:
-            return
-
-        device = None
-        package = None
-        symptom = None
-
-        # Give lowest priority to required packages
-        for resource in test.get("resources", []):
-            if "version" in resource:
-                package = resource["name"]
-                break
-
-        # Give highest priority to required devices
-        for resource in test.get("resources", []):
-            if "bus" in resource:
-                category = resource["category"]
-                if category in CATEGORY_TO_PACKAGE:
-                    package = CATEGORY_TO_PACKAGE[category]
-                    break
-
-                if category in CATEGORY_TO_SYMPTOM:
-                    symptom = CATEGORY_TO_SYMPTOM[category]
-                    break
-
-        # Default to configuration
-        if not package:
-            package = self.default_package
-
-        # Do not report a bug if no package nor symptom is defined
-        if not package and not symptom:
-            return
-
-        if test.get("suite"):
-            failed_test_message = _("Test %(name)s failed.") % {
-                                   'name': test["name"]}
-        else:
-            failed_test_message = _("Test %s failed.") % test["name"]
-        failed_test_message += "\n" + _("Do you want to report a bug?")
-
-        response = interface.show_info(failed_test_message,
-            ["yes", "no"], "no")
-        if response == "no":
-            return
-
-        # Determine corresponding device
-        for resource in test.get("resources", []):
-            if "bus" in resource:
-                device = resource["category"].lower()
-                break
-
-        try:
-            options = ApportOptions(test, device, package, symptom)
-            apport_interface = ApportUserInterface(interface, options)
-        except ImportError as e:
-            interface.show_error(_("Is a package upgrade in process? Error: %s") % e)
-            return
-
-        try:
-            if symptom and hasattr(apport_interface, "run_symptom"):
-                apport_interface.run_symptom()
-            else:
-                apport_interface.run_report_bug()
-        except SystemExit as e:
-            # In case of error, show_error already have been called
-            raise StopAllException
-
-    def exchange_success(self, response):
-        for message, filename in [
-             (self._submission_id, self.submission_filename),
-             (self._system_id, self.system_filename)]:
-            try:
-                file = open(filename, "w")
-                try:
-                    file.write(message)
-                finally:
-                    file.close()
-            except IOError as e:
-                logging.info("Failed to write to file '%s': %d %s",
-                    filename, e.errno, e.strerror)
-
-    def report_submission_id(self, submission_id):
-        self._submission_id = submission_id
-
-    def report_system_id(self, system_id):
-        self._system_id = system_id
-
-
-factory = ApportPrompt
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-09-19 22:09:38 +0000
+++ po/POTFILES.in	2012-09-27 16:14:24 +0000
@@ -53,7 +53,6 @@
 checkbox_urwid/urwid_interface.py
 checkbox_gtk/gtk_interface.py
 checkbox/user_interface.py
-plugins/apport_prompt.py
 plugins/final_prompt.py
 plugins/gather_prompt.py
 plugins/intro_prompt.py