rpms/hplip/devel hplip-no-root-config.patch, 1.4, 1.5 hplip.spec, 1.141, 1.142

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32505

Modified Files:
	hplip-no-root-config.patch hplip.spec 
Log Message:
* Mon Jul  9 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-5
- Read system config when run as root (bug #242974).


hplip-no-root-config.patch:

Index: hplip-no-root-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-no-root-config.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hplip-no-root-config.patch	29 Jun 2007 16:58:55 -0000	1.4
+++ hplip-no-root-config.patch	9 Jul 2007 14:22:52 -0000	1.5
@@ -4,7 +4,7 @@
  
          log.debug("Reading config file %s" % 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/devel/hplip.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- hplip.spec	9 Jul 2007 09:49:20 -0000	1.141
+++ hplip.spec	9 Jul 2007 14:22:52 -0000	1.142
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.7.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -266,6 +266,9 @@
 exit 0
 
 %changelog
+* Mon Jul  9 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-5
+- Read system config when run as root (bug #242974).
+
 * Mon Jul  9 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-4
 - Moved reportlab requirement to gui sub-package (bug #189030).
 - Patchlevel 1.