merge from mvo

* apt/cache.py:
  - re-work the logic in commit() to fail if installArchives() returns
    a unexpected result
* apt/progress/__init__.py:
  - catch exceptions in pm.DoInstall()

1 files changed, 5 insertions, 1 deletions

diff --git a/apt/cache.py b/apt/cache.py
index 828b167b..bb944041 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -314,8 +314,12 @@ class Cache(object):
             res = self.installArchives(pm, installProgress)
             if res == pm.ResultCompleted:
                 break
-            if res == pm.ResultFailed:
+            elif res == pm.ResultFailed:
                 raise SystemError("installArchives() failed")
+            elif res == pm.ResultIncomplete:
+                 pass
+            else:
+                 raise SystemError("internal-error: unknown result code from InstallArchives: %s" % res)
             # reload the fetcher for media swaping
             fetcher.Shutdown()
         return (res == pm.ResultCompleted)