From f4a434afc334663c7b814c2aef6ec1ac29ececc9 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 9 Jul 2007 14:22:52 +0000
Subject: [PATCH] - Read system config when run as root (bug #242974).

---
 hplip-no-root-config.patch | 2 +-
 hplip.spec                 | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hplip-no-root-config.patch b/hplip-no-root-config.patch
index 1d35f57..028ecd4 100644
--- a/hplip-no-root-config.patch
+++ b/hplip-no-root-config.patch
@@ -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
 +
diff --git a/hplip.spec b/hplip.spec
index a7ce2b7..dafc73c 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -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 @@ fi
 exit 0
 
 %changelog
+* Mon Jul  9 2007 Tim Waugh <twaugh@redhat.com> 2.7.6-5
+- Read system config when run as root (bug #242974).
+
 * Mon Jul  9 2007 Tim Waugh <twaugh@redhat.com> 2.7.6-4
 - Moved reportlab requirement to gui sub-package (bug #189030).
 - Patchlevel 1.