Fixed utils.addgroup() to return array instead of string (bug #642771).
This commit is contained in:
parent
69f4e8d50d
commit
74ded0ec4a
14
hplip-addgroup.patch
Normal file
14
hplip-addgroup.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -up hplip-3.10.9/base/utils.py.addgroup hplip-3.10.9/base/utils.py
|
||||
--- hplip-3.10.9/base/utils.py.addgroup 2010-10-14 10:52:34.000000000 +0200
|
||||
+++ hplip-3.10.9/base/utils.py 2010-10-14 11:35:17.000000000 +0200
|
||||
@@ -65,8 +65,8 @@ def addgroup():
|
||||
fp=open('/etc/cups/cupsd.conf')
|
||||
except IOError:
|
||||
try:
|
||||
- if "root" != grp.getgrgid(os.stat('/etc/cups/cupsd.conf').st_gid)[0]:
|
||||
- return grp.getgrgid(os.stat('/etc/cups/cupsd.conf').st_gid)[0]
|
||||
+ if "root" != grp.getgrgid(os.stat('/etc/cups/cupsd.conf').st_gid).gr_name:
|
||||
+ return [grp.getgrgid(os.stat('/etc/cups/cupsd.conf').st_gid).gr_name]
|
||||
except OSError:
|
||||
return lis
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: HP Linux Imaging and Printing Project
|
||||
Name: hplip
|
||||
Version: 3.10.9
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+ and MIT
|
||||
Group: System Environment/Daemons
|
||||
Conflicts: system-config-printer < 0.6.132
|
||||
@ -36,6 +36,7 @@ Patch20: hplip-no-system-tray.patch
|
||||
Patch21: hplip-openPPD.patch
|
||||
Patch22: hplip-ppd-ImageableArea.patch
|
||||
Patch23: hplip-network-timeout.patch
|
||||
Patch24: hplip-addgroup.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
@ -230,6 +231,9 @@ done
|
||||
# Increase timeouts for curl, wget, ping for high latency networks (bug #635388).
|
||||
%patch23 -p1 -b .network-timeout
|
||||
|
||||
# utils.addgroup() was returning string instead of array (bug #642771).
|
||||
%patch24 -p1 -b .addgroup
|
||||
|
||||
sed -i.duplex-constraints \
|
||||
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
|
||||
prnt/drv/hpcups.drv.in
|
||||
@ -456,6 +460,9 @@ fi
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Thu Oct 14 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.9-2
|
||||
- Fixed utils.addgroup() to return array instead of string (bug #642771).
|
||||
|
||||
* Mon Oct 04 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.9-1
|
||||
- 3.10.9.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user