rpms/hplip/F-7 hplip-no-root-config.patch, 1.3, 1.4 hplip.spec, 1.136, 1.137

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32339

Modified Files:
	hplip-no-root-config.patch hplip.spec 
Log Message:
* Thu Jun 28 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-3
- Another go at avoiding AVC messages on boot (bug #244205).


hplip-no-root-config.patch:

Index: hplip-no-root-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/hplip-no-root-config.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hplip-no-root-config.patch	28 Jun 2007 15:35:05 -0000	1.3
+++ hplip-no-root-config.patch	9 Jul 2007 14:22:08 -0000	1.4
@@ -4,7 +4,7 @@
          dict.__setattr__(self, "config_obj", ConfigParser.ConfigParser())
          dict.__setattr__(self, "filename", filename)
  
-+        if filename.startswith ("/root/") or os.getuid () == 0:
++        if filename.startswith ("/root/"):
 +            # Don't try opening a file in root's home directory.
 +            return
 +


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-7/hplip.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- hplip.spec	28 Jun 2007 15:35:05 -0000	1.136
+++ hplip.spec	9 Jul 2007 14:22:08 -0000	1.137
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.4a
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -289,6 +289,9 @@
 exit 0
 
 %changelog
+* Mon Jul  9 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-4
+- Read system config when run as root (bug #242974).
+
 * Thu Jun 28 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-3
 - Another go at avoiding AVC messages on boot (bug #244205).