Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37736677
en ru br
Репозитории ALT
S:3.23.8-alt1
5.1: 3.11.5-alt0.M51.1
4.1: 2.8.10-alt2.M41.1
4.0: 2.7.12-alt2.M40.1
+backports:2.8.10-alt2.M40.1
3.0:
+backports:1.6.6a-alt0.M30.4.1
www.altlinux.org/Changes

Группа :: Издательство
Пакет: hplip

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: fedora-2.7.12-4-hplip-no-root-config.patch
Скачать


diff -up hplip-2.7.7/base/g.py.no-root-config hplip-2.7.7/base/g.py
--- hplip-2.7.7/base/g.py.no-root-config	2007-06-18 17:56:32.000000000 +0100
+++ hplip-2.7.7/base/g.py	2007-09-25 15:23:23.000000000 +0100
@@ -105,6 +105,10 @@ class Config(dict):
 
         log.debug("Reading config file %s" % filename)
 
+        if filename.startswith ("/root/") or filename.startswith ("/var/"):
+            # 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,25 @@ class Config(dict):
 # 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/") or
+         prop.user_config_file.startswith ("/var/")) 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)
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin