summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-01-26 12:10:44 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-01-26 12:10:44 +0100
commit33522c90ad814bc03643fd3bea435315831a8c7f (patch)
treef97414249d3c267773b8f6f34403fef9375c87d6
parent52546cc5e1a3980301286b8c2c14354d0b3b6dc5 (diff)
downloadpython-apt-33522c90ad814bc03643fd3bea435315831a8c7f.tar.gz
revert commit r317
-rw-r--r--apt/cache.py1
-rw-r--r--debian/changelog5
2 files changed, 0 insertions, 6 deletions
diff --git a/apt/cache.py b/apt/cache.py
index a8432a32..0065d14c 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -55,7 +55,6 @@ class Cache(object):
apt_pkg.Config.Set("Dir", rootdir)
apt_pkg.Config.Set("Dir::State::status",
rootdir + "/var/lib/dpkg/status")
- apt_pkg.InitConfig()
self.open(progress)
def _runCallbacks(self, name):
diff --git a/debian/changelog b/debian/changelog
index f3514680..0b41246f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,6 @@ python-apt (0.7.9~exp3) experimental; urgency=low
- fix incorrect indent
* debian/control:
- add Recommends to iso-codes (for iso_3166.xml)
- * apt/cache.py:
- - when running with the rootdir option, run
- InitConfig() again to ensure that the config
- from the rootdir is read, not from the host
- (lp: #243550)
* apt/package.py:
- make sure to set the defaulttimeout back to the
original value (in getChangelog(), LP: #314212)