Merge lp:~enr0n/ubuntu/jammy/apport/lp.1952947 into lp:~ubuntu-core-dev/ubuntu/jammy/apport/ubuntu

[Nick Rosbrook]

[Nick Rosbrook (enr0n)]

Previous review happened here: https://code.launchpad.net/~enr0n/ubuntu/+source/apport/+git/apport/+merge/415620.

=== modified file 'apport/ui.py'
--- apport/ui.py	2021-12-01 22:11:09 +0000
+++ apport/ui.py	2022-02-15 22:16:37 +0000
@@ -727,6 +727,19 @@
                 self.ui_error_message(_('Invalid problem report'), excstr(e))
             return True
         elif self.options.window:
+            if os.getenv('XDG_SESSION_TYPE') == 'wayland':
+                self.ui_error_message(_('Cannot create report'),
+                                      _('The window option cannot be used on '
+                                        'Wayland.\n\nPlease find the window\'s '
+                                        'process ID and then run \'ubuntu-bug '
+                                        '<process ID>\'.'
+                                        '\n\nThe process ID can be found '
+                                        'by running the System Monitor application. '
+                                        'In the Processes tab, scroll until you '
+                                        'find the correct application. The process '
+                                        'ID is the number listed in the ID column.'))
+                return True
+
             self.ui_info_message('', _('After closing this message '
                                        'please click on an application window to report a problem about it.'))
             xprop = subprocess.Popen(['xprop', '_NET_WM_PID'],

=== modified file 'debian/changelog'
--- debian/changelog	2022-01-25 17:59:14 +0000
+++ debian/changelog	2022-02-15 22:16:37 +0000
@@ -1,3 +1,9 @@
+apport (2.20.11-0ubuntu77) UNRELEASED; urgency=medium
+
+  * apport/ui.py: Error out when -w option is used on wayland (LP: #1952947).
+
+ -- Nick Rosbrook <[e-mail]>  Tue, 15 Feb 2022 10:10:59 -0500
+
 apport (2.20.11-0ubuntu76) jammy; urgency=medium
 
   * data/package-hooks/ubuntu-desktop-installer.py: Add in a new package hook

=== modified file 'man/apport-cli.1'
--- man/apport-cli.1	2011-04-19 08:21:30 +0000
+++ man/apport-cli.1	2022-02-15 22:16:37 +0000
@@ -125,6 +125,11 @@
 the name of the package, or if the application window has stopped responding
 and you cannot report the problem from the "Help" menu of the application.
 
+This option is not supported on Wayland. Users running Wayland should use another
+option such as
+.B -P
+to specify the application.
+
 .SH ENVIRONMENT
 
 .TP