Merge ~enr0n/ubuntu/+source/apport:lp.1952947 into ubuntu/+source/apport:ubuntu/devel

[Nick Rosbrook]

[Brian Murray (brian-murray)]

Could the error message be even more helpful? Is there some desktop app that lists processes that we can point people at? (I've no idea but want to help people report their bug.)

Could you also update the apport-cli man page? Thanks!

review: Needs Fixing

[Nick Rosbrook (enr0n)]

> Could the error message be even more helpful? Is there some desktop app that
> lists processes that we can point people at? (I've no idea but want to help
> people report their bug.)

Both GNOME and KDE have "System Monitor" applications that we could direct people to.
>
> Could you also update the apport-cli man page? Thanks!

Will do. Thanks for reviewing.

[Brian Murray (brian-murray)]

Ah yeah, the system monitor application seems to have icons that match the programs which could help people sort out the PID.

Unmerged commits

d42081c... by Nick Rosbrook on 2022-02-15

apport: error out when -w option is used on wayland

The -w,--window command line flag results in apport using xprop to get
the window's PID. On wayland, xprop cannot be used, and trying to call
xprop results in a non-responsive apport UI. Due to wayland's
architecture, there is no viable replacement for xprop. When the -w
option is used on wayland, error out with a helpful message.

LP: #1952947

diff --git a/apport/ui.py b/apport/ui.py
index 200f7ff..3de0aa6 100644
--- a/apport/ui.py
+++ b/apport/ui.py
@@ -727,6 +727,19 @@ class UserInterface:
                 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'],
diff --git a/debian/changelog b/debian/changelog
index 6e892e9..14df5c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/man/apport-cli.1 b/man/apport-cli.1
index 298a07f..575a9b0 100644
--- a/man/apport-cli.1
+++ b/man/apport-cli.1
@@ -125,6 +125,11 @@ for you. This option can be specially useful in situations when you do not know
 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