Attachment 1975792 Details for Bug 2192131 – Proposed patch

[patch] Proposed patch

hplip-fix-parsing-lpstat.patch (text/plain), 1010 bytes, created by Zdenek Dohnal on 2023-07-14 12:43:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zdenek Dohnal

Created: 2023-07-14 12:43:58 UTC

Size: 1010 bytes

patch

obsolete

>diff --git a/base/queues.py b/base/queues.py
>index 2f56c8a..f15cdcd 100755
>--- a/base/queues.py
>+++ b/base/queues.py
>@@ -51,7 +51,6 @@ NET_PATTERN = re.compile(r"""(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""")
> NET_ZC_PATTERN = re.compile(r'''zc=(.*)''',re.IGNORECASE)
> NET_OTHER_PATTERN = re.compile(r'''(.*)://(.*)''',re.IGNORECASE)
> USB_PATTERN = re.compile(r'''serial=(.*)''',re.IGNORECASE)
>-LPSTAT_PATTERN = re.compile(r"""(\S*)(\s)?: (.*)""", re.IGNORECASE)
> #BACK_END_PATTERN = re.compile(r'''(.*):(.*)''',re.IGNORECASE)
> 
> 
>@@ -99,9 +98,9 @@ def parseQueues(mode):
>     else:
>         for p in output.splitlines():
>             try:
>-                match = LPSTAT_PATTERN.search(p)
>-                printer_name = match.group(1)
>-                device_uri = match.group(2)
>+                p = p.split()
>+                printer_name = p[2][:-1]
>+                device_uri = p[3]
>                 cups_printers.append((printer_name, device_uri))
>             except AttributeError:
>                 pass

Actions: View | Diff

Attachments on bug 2192131: 1961022 | 1961023 | 1961024 | 1961025 | 1961026 | 1961027 | 1961028 | 1975792