summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-06-21 07:42:23 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-06-21 07:42:23 -0500
commitb3bad727bc0968cd8b7fb29573e74d551a13c74d (patch)
tree6c2d261049ecdac043aeaf5a7a0aa07e5a12a682
parent19586bc42aa90543cf27e33ec32bd7df222138e8 (diff)
downloadbcfg2-b3bad727bc0968cd8b7fb29573e74d551a13c74d.tar.gz
bcfg2-b3bad727bc0968cd8b7fb29573e74d551a13c74d.tar.bz2
bcfg2-b3bad727bc0968cd8b7fb29573e74d551a13c74d.zip
Frame: Fix 'important' interactive installation (#1015)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--src/lib/Client/Frame.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py
index e33e1a7df..d8e308ee0 100644
--- a/src/lib/Client/Frame.py
+++ b/src/lib/Client/Frame.py
@@ -200,15 +200,18 @@ class Frame:
tl = [t for t in self.tools if t.handlesEntry(cfile) \
and t.canVerify(cfile)]
if tl:
- if not tl[0].VerifyPath(cfile, []):
- if self.setup['interactive'] and not \
- promptFilter("Install %s: %s? (y/N):", [cfile]):
- continue
- try:
- self.states[cfile] = tl[0].InstallPath(cfile)
- except:
- self.logger.error("Unexpected tool failure",
- exc_info=1)
+ if self.setup['interactive'] and not \
+ promptFilter("Install %s: %s? (y/N):", [cfile]):
+ self.whitelist.remove(cfile)
+ continue
+ try:
+ self.states[cfile] = tl[0].InstallPath(cfile)
+ except:
+ self.logger.error("Unexpected tool failure",
+ exc_info=1)
+ cfile.set('qtext', '')
+ if tl[0].VerifyPath(cfile, []):
+ self.whitelist.remove(cfile)
def Inventory(self):
"""