diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/scripting/python/samba/dbchecker.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/dbchecker.py b/source4/scripting/python/samba/dbchecker.py index 6a334f40ab..4209a3b78c 100644 --- a/source4/scripting/python/samba/dbchecker.py +++ b/source4/scripting/python/samba/dbchecker.py @@ -100,10 +100,18 @@ class dbcheck(object): return False if self.quiet: return self.yes - forced = self.yes or getattr(self, all_attr) + if getattr(self, all_attr) == 'NONE': + return False + if getattr(self, all_attr) == 'ALL': + forced = True + else: + forced = self.yes c = common.confirm(msg, forced=forced, allow_all=True) if c == 'ALL': - setattr(self, all_attr, True) + setattr(self, all_attr, 'ALL') + return True + if c == 'NONE': + setattr(self, all_attr, 'NONE') return True return c |