Merge lp:~juliank/ubuntu/bionic/apport/snap into lp:~ubuntu-core-dev/ubuntu/bionic/apport/ubuntu

[Julian Andres Klode]

[Steve Langasek (vorlon)]

review: Needs Fixing

[lp:~juliank/ubuntu/bionic/apport/snap]

2620. By Julian Andres Klode on 2018-03-28

Change "The report belongs to a" to "This report is about a"

2621. By Julian Andres Klode on 2018-03-28

Tweak forum.snapcraft.io message

2622. By Julian Andres Klode on 2018-03-28

Clarify situation where both deb and snap are installed

[Steve Langasek (vorlon)]

looks good, a few small language tweaks only.

review: Needs Fixing

[Brian Murray (brian-murray)]

I think there a couple of instances where we will know whether or not the report should be about the deb package. In the event that information is being collected about a crash then ExecutablePath will be set and we can check if that is from a snap or a deb package. Additionally, it is possible to use the command ubuntu-bug about a program path. In that case we'd also know whether the program path was from a deb package or a snap. That being said I couldn't easily tell if that information was passed on to ui.py.

review: Needs Fixing

[Julian Andres Klode (juliank)]

I think the use case we are looking at is apport-bug <package name>, so we can just restrict snap handling to that. (if we crashed in a snap we won't have a cur_package, so we don't even reach that point).

[lp:~juliank/ubuntu/bionic/apport/snap]

2623. By Julian Andres Klode on 2018-03-29

Restrict snap handling to apport-bug <package name>

2624. By Julian Andres Klode on 2018-03-29

Wording improvements: .deb => deb, "," to "."

[Brian Murray (brian-murray)]

This looks good to me now although we should open a bug about

 809 # executable?
 810 elif '/' in self.args[0]:
 811 pkg = apport.packaging.get_file_package(self.args[0])
 812 if not pkg:
 813 optparser.error('%s does not belong to a package.' % self.args[0])
 814 sys.exit(1)

not working with snaps.

review: Approve

[Brian Murray (brian-murray)]

I reported the bug https://bugs.launchpad.net/ubuntu/+source/apport/+bug/1760220.

=== modified file 'apport/ui.py'
--- apport/ui.py	2018-02-14 18:17:53 +0000
+++ apport/ui.py	2018-03-29 09:18:49 +0000
@@ -66,6 +66,19 @@
     return True
 
 
+def find_snap(package):
+    import requests_unixsocket
+
+    session = requests_unixsocket.Session()
+    try:
+        r = session.get('http+unix://%2Frun%2Fsnapd.socket/v2/snaps/{}'.format(package))
+        if r.status_code == 200:
+            j = r.json()
+            return j["result"]
+    except Exception:
+        return None
+
+
 def thread_collect_info(report, reportfile, package, ui, symptom_script=None,
                         ignore_uninstalled=False):
     '''Collect information about report.
@@ -190,6 +203,7 @@
         self.report_file = None
         self.cur_package = None
         self.offer_restart = False
+        self.specified_a_pkg = False
 
         try:
             self.crashdb = apport.crashdb.get_crashdb(None)
@@ -819,6 +833,7 @@
         # otherwise: package name
         else:
             self.options.filebug = True
+            self.specified_a_pkg = True
             self.options.package = self.args[0]
             self.args = []
 
@@ -1054,14 +1069,37 @@
                         repr(e))
                     self.report['_MarkForUpload'] = 'False'
                 except ValueError:  # package does not exist
-                    self.report['UnreportableReason'] = _('The report belongs to a package that is not installed.')
-                    self.report['_MarkForUpload'] = 'False'
+                    snap = find_snap(self.cur_package)
+                    if not snap:
+                        pass
+                    elif snap.get("contact", ""):
+                        self.report['UnreportableReason'] = _('This report is about a snap published by %s. Contact them via %s for help.') % (snap["developer"], snap["contact"])
+                        self.report['_MarkForUpload'] = 'False'
+                    else:
+                        self.report['UnreportableReason'] = _('This report is about a snap published by %s. No contact address has been provided; visit the forum at https://forum.snapcraft.io/ for help.') % snap["developer"]
+                        self.report['_MarkForUpload'] = 'False'
+
+                    if 'UnreportableReason' not in self.report:
+                        self.report['UnreportableReason'] = _('This report is about a package that is not installed.')
+                        self.report['_MarkForUpload'] = 'False'
                 except Exception as e:
                     apport.error(repr(e))
                     self.report['UnreportableReason'] = _('An error occurred while attempting to '
                                                           'process this problem report:') + '\n\n' + str(e)
                     self.report['_MarkForUpload'] = 'False'
 
+            snap = find_snap(self.cur_package)
+            if snap and 'UnreportableReason' not in self.report and self.specified_a_pkg:
+                if snap.get("contact", ""):
+                    msg = _('You are about to report a bug against the deb package, but you also a have snap published by %s installed. You can contact them via %s for help. Do you want to continue with the bug report against the deb?') % (snap["developer"], snap["contact"])
+                else:
+                    msg = _('You are about to report a bug against the deb package, but you also a have snap published by %s installed. For the snap, no contact address has been provided; visit the forum at https://forum.snapcraft.io/ for help. Do you want to continue with the bug report against the deb?') % snap["developer"]
+
+                if not self.ui_question_yesno(msg):
+                    self.ui_stop_info_collection_progress()
+                    sys.exit(0)
+                    return
+
             if 'UnreportableReason' in self.report or not self.check_report_crashdb():
                 self.ui_stop_info_collection_progress()
                 if on_finished:

=== modified file 'debian/changelog'
--- debian/changelog	2018-03-28 18:45:34 +0000
+++ debian/changelog	2018-03-29 09:18:49 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 apport (2.20.9-0ubuntu2) bionic; urgency=medium
 
   * data/general-hooks/generic.py: Have JournalErrors include warnings but
@@ -6,6 +7,14 @@
 
  -- Brian Murray <[e-mail]>  Wed, 28 Mar 2018 11:45:29 -0700
 
+=======
+apport (2.20.9-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Help people who are trying to report bugs against snaps (LP: #1729491)
+
+ -- Julian Andres Klode <[e-mail]>  Tue, 27 Mar 2018 16:08:34 +0200
+
+>>>>>>> MERGE-SOURCE
 apport (2.20.9-0ubuntu1) bionic; urgency=medium
 
   * New upstream release:

=== modified file 'debian/control'
--- debian/control	2017-12-13 18:30:20 +0000
+++ debian/control	2018-03-29 09:18:49 +0000
@@ -114,6 +114,7 @@
  python3-apt (>= 0.7.9),
  python3-httplib2,
  python3-problem-report (>= 0.94),
+ python3-requests-unixsocket,
  lsb-release,
  ${misc:Depends}
 Recommends: apport