summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <asulfrian@zedat.fu-berlin.de>2022-01-30 04:54:49 +0100
committerAlexander Sulfrian <asulfrian@zedat.fu-berlin.de>2022-01-30 05:03:22 +0100
commitc11f4f790d710721dcc99f87cfcbafb49e9a4715 (patch)
treeb66db96e80075ffd5311d98f30dc6d6bb4468501
parenta4bd3e3b55cc842b50075e9cae912f7dc9e9cfa2 (diff)
downloadbcfg2-c11f4f790d710721dcc99f87cfcbafb49e9a4715.tar.gz
bcfg2-c11f4f790d710721dcc99f87cfcbafb49e9a4715.tar.bz2
bcfg2-c11f4f790d710721dcc99f87cfcbafb49e9a4715.zip
debconf: Verify seen value
-rw-r--r--src/lib/Bcfg2/Client/Tools/Debconf.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Debconf.py b/src/lib/Bcfg2/Client/Tools/Debconf.py
index 2dc88e748..784f7e9bc 100644
--- a/src/lib/Bcfg2/Client/Tools/Debconf.py
+++ b/src/lib/Bcfg2/Client/Tools/Debconf.py
@@ -53,7 +53,7 @@ class Debconf(Bcfg2.Client.Tools.Tool):
return (False, None)
(_, seen) = self._debconf_reply('FGET %s seen\n' % key)
- return (seen, value)
+ return (seen == 'true', value)
def debconf_set(self, key, value):
(success, _) = self._debconf_reply('SET %s %s\n' % (key, value))
@@ -71,9 +71,12 @@ class Debconf(Bcfg2.Client.Tools.Tool):
if entry.get('ignore', 'false').lower() == 'true':
return True
- (_, current_value) = self.debconf_get(entry.get('name'))
+ (seen, current_value) = self.debconf_get(entry.get('name'))
+ if not seen:
+ current_value = '%s (not seen)' % current_value
entry.set('current_value', current_value)
- return current_value == entry.get('value')
+
+ return seen and current_value == entry.get('value')
def InstallConf(self, entry):
""" Install the given Debconf entry. """