rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

RHEL-28165 - configure-printer exits with failure status when device is already handled

Browse Source 
Resolves: RHEL-28165
This commit is contained in:
Zdenek Dohnal 2024-03-20 15:57:43 +01:00
parent 526b24be16
commit 3c90dd62d5
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0001-udev-Fix-exit-value-when-device-is-already-handled.patch Normal file
View File

@ -0,0 +1,35 @@
From 77540d0cb539364bbf63e21cfa970e62d9a86ed3 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 12 Mar 2024 18:59:43 +0100
Subject: [PATCH] udev: Fix exit value when device is already handled
---
NEWS | 1 +
udev/udev-configure-printer.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
index fd158b09..5703c1af 100644
--- a/udev/udev-configure-printer.c
+++ b/udev/udev-configure-printer.c
@@ -806,7 +806,7 @@ device_id_from_devpath (struct udev *udev, const char *devpath,
{
udev_device_unref (dev);
syslog (LOG_ERR, "unable to access %s", syspath);
- return NULL;
+ exit (1);
}
usb_device_devpath = strdup (udev_device_get_devpath (dev));
@@ -831,7 +831,7 @@ device_id_from_devpath (struct udev *udev, const char *devpath,
syslog (LOG_DEBUG, "Device already handled");
free (usb_device_devpath);
free (devicefilepath);
- return NULL;
+ exit (0);
}
serial = udev_device_get_sysattr_value (dev, "serial");
--
2.44.0

7
system-config-printer.spec
View File

@ -9,13 +9,15 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.5.18
Release: 7%{?dist}
Release: 8%{?dist}
License: GPL-2.0-or-later
URL: https://github.com/%{username}/%{name}
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
# all upstream patches, remove with new release
Patch0001: 0001-Fix-debugprint-in-options.py-fixes-291.patch
# RHEL-28165 - configure-printer exits with failure status when device is already handled
Patch0002: 0001-udev-Fix-exit-value-when-device-is-already-handled.patch
# needed for macro AM_GNU_GETTEXT in configure.ac
@ -295,6 +297,9 @@ exit 0
%endif
%changelog
* Wed Mar 20 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-8
- RHEL-28165 - configure-printer exits with failure status when device is already handled
* Tue Jan 23 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1.5.18-7
- 2259526 - FTBFS s-c-p due missing distutils