diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-08-22 19:32:20 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-08-22 19:32:20 +0000 |
| commit | 31b12d4b59c8aebd1d7ec410383e8cf202efedb5 (patch) | |
| tree | a6184a79f2b5b4326e534e90e97d4f9b6eddc8d0 /src/lib/Client | |
| parent | e14a503bbab0421ff3cc1fbeedf50ce99317d1e9 (diff) | |
| download | bcfg2-31b12d4b59c8aebd1d7ec410383e8cf202efedb5.tar.gz bcfg2-31b12d4b59c8aebd1d7ec410383e8cf202efedb5.tar.bz2 bcfg2-31b12d4b59c8aebd1d7ec410383e8cf202efedb5.zip | |
Add -k (kevlar) option, and move objectionable debian behavion in here.
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2088 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client')
| -rw-r--r-- | src/lib/Client/Debian.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/Client/Debian.py b/src/lib/Client/Debian.py index 2ad28f08f..4c13443f0 100644 --- a/src/lib/Client/Debian.py +++ b/src/lib/Client/Debian.py @@ -23,11 +23,10 @@ class ToolsetImpl(Bcfg2.Client.Toolset.Toolset): null = open('/dev/null', 'w+') os.dup2(null.fileno(), sys.__stdin__.fileno()) if not self.setup['dryrun']: - self.saferun("dpkg --force-confold --configure -a") - if not self.setup['build']: - self.saferun("/usr/sbin/dpkg-reconfigure -f noninteractive debconf < /dev/null") - self.saferun("apt-get clean") - self.saferun("apt-get -q=2 -y update") + if self.setup['kevlar']: + self.saferun("dpkg --force-confold --configure --pending") + self.saferun("apt-get clean") + self.saferun("apt-get -q=2 -y update") self.installed = {} self.pkgwork = {'add':[], 'update':[], 'remove':[]} for pkg in [cpkg for cpkg in self.cfg.findall(".//Package") if not cpkg.attrib.has_key('type')]: |