From 672afa8a5ebd29d89492cdb36a34cd791a3f4ada Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 3 Apr 2006 17:49:38 +0200
Subject: * when runing gpg, protect it with try: except:

---
 UpdateManager/DistUpgradeFetcher.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'UpdateManager')

diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py
index c6b83994..794566c2 100644
--- a/UpdateManager/DistUpgradeFetcher.py
+++ b/UpdateManager/DistUpgradeFetcher.py
@@ -114,7 +114,11 @@ class DistUpgradeFetcher(object):
         proc = gpg.run(['--verify', signature, file],
                        create_fhs=['status','logger','stderr'])
         gpgres = proc.handles['status'].read()
-        proc.wait()
+        try:
+            proc.wait()
+        except IOError:
+            # gnupg returned a problem (non-zero exit)
+            return False
         if "VALIDSIG" in gpgres:
             return True
         return False
-- 
cgit v1.2.3