From 39cbd4f0f1bf4f40229f50aa5480b4b25eaae1a5 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 28 Jan 2024 16:31:03 +1100
Subject: [PATCH 1/3] Expanded error message strings

---
 src/PIL/ImageGrab.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py
index c04be521f..b888e66f1 100644
--- a/src/PIL/ImageGrab.py
+++ b/src/PIL/ImageGrab.py
@@ -163,11 +163,11 @@ def grabclipboard():
                 # wl-paste, when the clipboard is empty
                 b"Nothing is copied",
                 # wl-paste/debian xclip, when an image isn't available
-                b"not available",
+                b" not available",
                 # xclip, when an image isn't available
-                b"cannot convert",
+                b"cannot convert ",
                 # xclip, when the clipboard isn't initialized
-                b"There is no owner",
+                b"xclip: Error: There is no owner for the ",
             ]:
                 if err in silent_error:
                     return None

From 5efa2ade222785979c1b085be09eff5ee738c42c Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 28 Jan 2024 16:53:27 +1100
Subject: [PATCH 2/3] Added test

---
 Tests/test_imagegrab.py | 12 ++++++++++++
 src/PIL/ImageGrab.py    |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Tests/test_imagegrab.py b/Tests/test_imagegrab.py
index 9d3d40398..efef4d908 100644
--- a/Tests/test_imagegrab.py
+++ b/Tests/test_imagegrab.py
@@ -119,3 +119,15 @@ $ms = new-object System.IO.MemoryStream(, $bytes)
             subprocess.call(["wl-copy"], stdin=fp)
         im = ImageGrab.grabclipboard()
         assert_image_equal_tofile(im, image_path)
+
+    @pytest.mark.skipif(
+        (
+            sys.platform != "linux"
+            or not all(shutil.which(cmd) for cmd in ("wl-paste", "wl-copy"))
+        ),
+        reason="Linux with wl-clipboard only",
+    )
+    @pytest.mark.parametrize("arg", ("text", "--clear"))
+    def test_grabclipboard_wl_clipboard_errors(self, arg):
+        subprocess.call(["wl-copy", arg])
+        assert ImageGrab.grabclipboard() is None
diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py
index b888e66f1..17f5750b1 100644
--- a/src/PIL/ImageGrab.py
+++ b/src/PIL/ImageGrab.py
@@ -162,7 +162,11 @@ def grabclipboard():
             for silent_error in [
                 # wl-paste, when the clipboard is empty
                 b"Nothing is copied",
-                # wl-paste/debian xclip, when an image isn't available
+                # Ubuntu/Debian wl-paste, when the clipboard is empty
+                b"No selection",
+                # Ubuntu/Debian wl-paste, when an image isn't available
+                b"No suitable type of content copied",
+                # wl-paste or Ubuntu/Debian xclip, when an image isn't available
                 b" not available",
                 # xclip, when an image isn't available
                 b"cannot convert ",

From d57b5e827cfd0e9850a074a4ba27e9f5ad0c9910 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 28 Jan 2024 16:49:44 +1100
Subject: [PATCH 3/3] Corrected check

---
 src/PIL/ImageGrab.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py
index 17f5750b1..3f3be706d 100644
--- a/src/PIL/ImageGrab.py
+++ b/src/PIL/ImageGrab.py
@@ -173,7 +173,7 @@ def grabclipboard():
                 # xclip, when the clipboard isn't initialized
                 b"xclip: Error: There is no owner for the ",
             ]:
-                if err in silent_error:
+                if silent_error in err:
                     return None
             msg = f"{args[0]} error"
             if err: