From bbded855044f2c750d0733ba3e9ad7f3cabfcb1b Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sun, 19 Jul 2009 14:17:07 +0100 Subject: [PATCH] Allow user to skip key lookup --- zeroinstall/injector/handler.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zeroinstall/injector/handler.py b/zeroinstall/injector/handler.py index f1197a0..1f3d132 100644 --- a/zeroinstall/injector/handler.py +++ b/zeroinstall/injector/handler.py @@ -224,13 +224,17 @@ class Handler(object): key_info_fetchers.append(kf) if key_info_fetchers: for kf in key_info_fetchers: print >>sys.stderr, kf.status - blockers = [kf.blocker for kf in key_info_fetchers] + stdin = tasks.InputBlocker(0, 'console') + blockers = [kf.blocker for kf in key_info_fetchers] + [stdin] yield blockers for b in blockers: try: tasks.check(b) except Exception, ex: warn("Failed to get key info: %s", ex) + if stdin.happened: + print >>sys.stderr, "Skipping remaining key lookups due to input from user" + break if len(valid_sigs) == 1: print >>sys.stderr, "Do you want to trust this key to sign feeds from '%s'?" % domain -- 2.11.4.GIT