summaryrefslogtreecommitdiff
path: root/python/samba/dbchecker.py
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2016-07-11 15:14:47 +1200
committerGarming Sam <garming@samba.org>2016-07-15 10:01:30 +0200
commit5361fc68436b4dcd8d1b7174daee27c78d3c7ade (patch)
treefe1e1e67f846e095f2a3de1a1fe2d85f41b8e8c3 /python/samba/dbchecker.py
parent58acf513f93479d4b4c89e05a699e0bbd5320268 (diff)
downloadsamba-5361fc68436b4dcd8d1b7174daee27c78d3c7ade.tar.gz
dbcheck: change argument to specify a partial --yes
Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba/dbchecker.py')
-rw-r--r--python/samba/dbchecker.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index ded4dc0a96c..f0c2217f683 100644
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -280,14 +280,14 @@ systemFlags: -1946157056%s""" % (dn, guid_suffix),
'''confirm a change with support for "all" '''
if not self.fix:
return False
- if self.quiet:
- return self.yes
if getattr(self, all_attr) == 'NONE':
return False
if getattr(self, all_attr) == 'ALL':
forced = True
else:
forced = self.yes
+ if self.quiet:
+ return forced
c = common.confirm(msg, forced=forced, allow_all=True)
if c == 'ALL':
setattr(self, all_attr, 'ALL')