diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2010-10-12 18:41:56 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2010-10-12 18:41:56 -0500 |
| commit | 2b0ea7df179353442712c830fb5c3a5164632d51 (patch) | |
| tree | 47f89fb59607f58fbb6fb30ba2dbe330bf8bd806 /src/lib/Client/Tools | |
| parent | 739dca016a69e28b25d94725ff7d8353a644d47b (diff) | |
| download | bcfg2-2b0ea7df179353442712c830fb5c3a5164632d51.tar.gz bcfg2-2b0ea7df179353442712c830fb5c3a5164632d51.tar.bz2 bcfg2-2b0ea7df179353442712c830fb5c3a5164632d51.zip | |
APT: Install missing configuration files (Fixes Ticket #622)
We used to not do this because the user may have removed the
configuration file in question on purpose. However, now that we have
support for nonexistent entries, we can afford to add this option
without any consequences.
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Client/Tools')
| -rw-r--r-- | src/lib/Client/Tools/APT.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Client/Tools/APT.py index 1c035f956..9dc2c5bba 100644 --- a/src/lib/Client/Tools/APT.py +++ b/src/lib/Client/Tools/APT.py @@ -40,6 +40,7 @@ class APT(Bcfg2.Client.Tools.Tool): pkgcmd = '%s ' % APTGET + \ '-o DPkg::Options::=--force-overwrite ' + \ '-o DPkg::Options::=--force-confold ' + \ + '-o DPkg::Options::=--force-confmiss ' + \ '--reinstall ' + \ '-q=2 ' + \ '--force-yes ' + \ @@ -91,7 +92,8 @@ class APT(Bcfg2.Client.Tools.Tool): elif "changed file" in item: files.append(item.split()[3]) elif "can't open" in item: - files.append(item.split()[5]) + if item.split()[5] not in self.nonexistent: + files.append(item.split()[5]) elif "missing file" in item and \ item.split()[3] in self.nonexistent: # these files should not exist |