Sophie

Sophie

distrib > Mandriva > mes5 > x86_64 > by-pkgid > 58e3563eecad3d3e54c1711a0b570af6 > files > 7

hplip-2.8.7-5mdv2009.0.src.rpm

--- hplip-2.7.6/base/g.py.no-root-config	2007-06-18 17:56:32.000000000 +0100
+++ hplip-2.7.6/base/g.py	2007-06-29 17:58:29.000000000 +0100
@@ -105,6 +105,10 @@
 
         log.debug("Reading config file %s" % filename)
 
+        if filename.startswith ("/root/"):
+            # Don't try opening a file in root's home directory.
+            return
+
         try:
             f = file(filename, 'r')
             self.config_obj.readfp(f)
@@ -134,23 +138,24 @@
 # Config file: directories and ports
 prop.sys_config_file = '/etc/hp/hplip.conf'
 prop.user_dir = os.path.expanduser('~/.hplip')
-
-os.umask(0037)
-try:
-    if not os.path.exists(prop.user_dir):
-        os.makedirs(prop.user_dir)
-except OSError:
-    pass # This is sometimes OK, if running hpfax: for example
-    
 prop.user_config_file = os.path.join(prop.user_dir, 'hplip.conf')
 
-if not os.path.exists(prop.user_config_file):
+if (not prop.user_config_file.startswith ("/root/") and
+    not os.getuid () == 0):
+    os.umask(0037)
     try:
-        file(prop.user_config_file, 'w').close()
-        s = os.stat(os.path.dirname(prop.user_config_file))
-        os.chown(prop.user_config_file, s[stat.ST_UID], s[stat.ST_GID])
-    except IOError:
-        pass
+        if not os.path.exists(prop.user_dir):
+            os.makedirs(prop.user_dir)
+    except OSError:
+        pass # This is sometimes OK, if running hpfax: for example
+    
+    if 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))
+            os.chown(prop.user_config_file, s[stat.ST_UID], s[stat.ST_GID])
+        except IOError:
+            pass
     
 sys_cfg = Config(prop.sys_config_file, True)
 user_cfg = Config(prop.user_config_file)