summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-01-29 09:36:15 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-01-29 09:36:15 +0100
commit54e8dd740523532425393caf91e10bbbf244c103 (patch)
tree2373eb616a6c0713f07380b0490c2fa40995a758
parent5cbf0b5807b4cc67818eae652b59a25d52eb9f7b (diff)
downloadpython-apt-54e8dd740523532425393caf91e10bbbf244c103.tar.gz
apt/cache.py: test for existance first before reading the file
-rw-r--r--apt/cache.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/apt/cache.py b/apt/cache.py
index b74f8ef1..01c12c94 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -52,9 +52,10 @@ class Cache(object):
# force apt to build its caches in memory
apt_pkg.Config.Set("Dir::Cache::pkgcache", "")
if rootdir:
- print "reading apt.conf"
- apt_pkg.ReadConfigFile(apt_pkg.Config, rootdir+"/etc/apt/apt.conf")
- apt_pkg.ReadConfigDir(apt_pkg.Config, rootdir+"/etc/apt/apt.conf.d")
+ if os.path.exists(rootdir+"/etc/apt/apt.conf"):
+ apt_pkg.ReadConfigFile(apt_pkg.Config, rootdir+"/etc/apt/apt.conf")
+ if os.path.isdir(rootdir+"/etc/apt/apt.conf.d"):
+ apt_pkg.ReadConfigDir(apt_pkg.Config, rootdir+"/etc/apt/apt.conf.d")
apt_pkg.Config.Set("Dir", rootdir)
apt_pkg.Config.Set("Dir::State::status",
rootdir + "/var/lib/dpkg/status")