diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2004-11-04 17:31:13 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2004-11-04 17:31:13 +0000 |
| commit | 16803b9eba9e88a2b995f06dfe7d3140e4add5d8 (patch) | |
| tree | 5f6ad8dfb4c1cfd88f635cdedb41253e0cf44ae9 /src/lib | |
| parent | 12e6791cb30a7f785fcd921eb35e83254ef82965 (diff) | |
| download | bcfg2-16803b9eba9e88a2b995f06dfe7d3140e4add5d8.tar.gz bcfg2-16803b9eba9e88a2b995f06dfe7d3140e4add5d8.tar.bz2 bcfg2-16803b9eba9e88a2b995f06dfe7d3140e4add5d8.zip | |
move to using apt.conf
(Logical change 1.146)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@649 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Client/Debian.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Client/Debian.py b/src/lib/Client/Debian.py index 04574cf5d..ebc22adea 100644 --- a/src/lib/Client/Debian.py +++ b/src/lib/Client/Debian.py @@ -16,13 +16,14 @@ class Debian(Toolset): '''The Debian toolset implements package and service operations and inherits the rest from Toolset.Toolset''' __important__ = ["/etc/apt/sources.list", "/var/cache/debconf/config.dat", \ - "/var/cache/debconf/templates.dat", '/etc/passwd', '/etc/group'] + "/var/cache/debconf/templates.dat", '/etc/passwd', '/etc/group', \ + '/etc/apt/apt.conf'] def __init__(self, cfg, setup): Toolset.__init__(self, cfg, setup) self.cfg = cfg environ["DEBIAN_FRONTEND"] = 'noninteractive' - system("dpkg --configure -a") + system("dpkg --force-confold --configure -a") if not self.setup['build']: system("dpkg-reconfigure -f noninteractive debconf < /dev/null") system("apt-get -q=2 -y update") @@ -130,7 +131,7 @@ class Debian(Toolset): def Install(self): '''Correct detected misconfigurations''' self.CondPrint("verbose", "Installing needed configuration changes") - cmd = '''apt-get -o Dpkg::Options="--force-confold --force-overwrite" --reinstall -q=2 -y install %s''' + cmd = '''apt-get --reinstall -q=2 -y install %s''' print "Need to remove:", self.pkgwork['remove'] self.setup['quick'] = True # need installed for bundle verification |