rpms/hplip/devel hplip-no-root-config.patch, 1.1, 1.2 hplip.spec, 1.132, 1.133

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	hplip-no-root-config.patch hplip.spec 
Log Message:
* Thu Jun 14 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-2
- Don't try to write a /root/.hplip.conf file when running as a CUPS
  backend (bug #244205).


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-no-root-config.patch	8 Jun 2007 11:36:24 -0000	1.1
+++ hplip-no-root-config.patch	14 Jun 2007 14:44:36 -0000	1.2
@@ -1,5 +1,5 @@
---- hplip-1.7.2/base/g.py.no-root-config	2007-05-30 16:08:04.000000000 +0100
-+++ hplip-1.7.2/base/g.py	2007-05-30 16:16:54.000000000 +0100
+--- hplip-1.7.4a/base/g.py.no-root-config	2007-06-14 15:40:43.000000000 +0100
++++ hplip-1.7.4a/base/g.py	2007-06-14 15:43:21.000000000 +0100
 @@ -88,6 +88,16 @@
          dict.__setattr__(self, "config_obj", ConfigParser.ConfigParser())
          dict.__setattr__(self, "filename", filename)
@@ -17,3 +17,13 @@
          try:
              pathmode = os.stat(filename)[stat.ST_MODE]
              if pathmode & 0022 != 0:
+@@ -129,7 +139,8 @@
+ prop.sys_config_file = '/etc/hp/hplip.conf'
+ prop.user_config_file = os.path.expanduser('~/.hplip.conf')
+ 
+-if not os.path.exists(prop.user_config_file):
++if (not prop.user_config_file.startswith ("/root/") and
++    not os.path.exists(prop.user_config_file)):
+     try:
+         file(prop.user_config_file, 'w').close()
+         s = os.stat(os.path.dirname(prop.user_config_file))


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- hplip.spec	13 Jun 2007 13:20:45 -0000	1.132
+++ hplip.spec	14 Jun 2007 14:44:36 -0000	1.133
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 1.7.4a
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -289,6 +289,10 @@
 exit 0
 
 %changelog
+* Thu Jun 14 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-2
+- Don't try to write a /root/.hplip.conf file when running as a CUPS
+  backend (bug #244205).
+
 * Wed Jun 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-1
 - Don't put the version in the desktop file; let desktop-file-install do it.
 - 1.7.4a.  No longer need marker-supply or faxing-with-low-supplies