diff options
| author | Julian Andres Klode <jak@debian.org> | 2014-03-10 14:31:38 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2014-03-10 14:31:38 +0100 |
| commit | a8c7a3ea4d471cfe1fc4eec624e626c888726391 (patch) | |
| tree | 4420561c30ea6e70c01d488388f00fd08625993b /apt | |
| parent | e2dc90ada1f861ee64cde554159f497d388e4df8 (diff) | |
| download | python-apt-a8c7a3ea4d471cfe1fc4eec624e626c888726391.tar.gz | |
Revert "* apt/cache.py:" (rootdir change)
This reverts commit 5e76e9fccee519c63602562dc4065deb3f97748b.
Conflicts:
apt/cache.py
debian/changelog
Diffstat (limited to 'apt')
| -rw-r--r-- | apt/cache.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apt/cache.py b/apt/cache.py index 593e70a7..36a9fa6b 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -85,16 +85,13 @@ class Cache(object): apt_pkg.config.set("Dir::Cache::pkgcache", "") if rootdir: rootdir = os.path.abspath(rootdir) - # clear old config first (Bug#728274) - apt_pkg.config.clear("APT") - apt_pkg.config.set("Dir", rootdir) - apt_pkg.init_config() if os.path.exists(rootdir + "/etc/apt/apt.conf"): apt_pkg.read_config_file(apt_pkg.config, rootdir + "/etc/apt/apt.conf") if os.path.isdir(rootdir + "/etc/apt/apt.conf.d"): apt_pkg.read_config_dir(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") # also set dpkg to the rootdir path so that its called for the |