Merge lp:~brian-murray/ubiquity/precise-bug-1051935 into lp:~ubuntu-installer/ubiquity/precise-proposed

[Brian Murray]

I've recently seen some Precise install failures due to bug 1051935 and I thought we might fix it for 12.04.4.

[Dimitri John Ledkov (xnox)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-08 00:32:32 +0000
+++ debian/changelog	2014-01-21 23:48:02 +0000
@@ -1,9 +1,14 @@
 ubiquity (2.10.29) UNRELEASED; urgency=low
 
+  [ Dmitrijs Ledkovs ]
   * Show labels in automatic side-by-side installation. Fixed by removing
     all cairo styling from partition boxes in automatic partitioning,
     instead use simple bg styling. (LP: #947107, #1240532)
 
+  [ Brian Murray ]
+  * Use the apt cache with with so that we close the cache when we are done
+    with it. (LP: #1051935)
+
  -- Dmitrijs Ledkovs <[e-mail]>  Wed, 16 Oct 2013 09:58:29 +0100
 
 ubiquity (2.10.28) precise; urgency=low

=== modified file 'ubiquity/install_misc.py'
--- ubiquity/install_misc.py	2012-05-16 22:22:30 +0000
+++ ubiquity/install_misc.py	2014-01-21 23:48:02 +0000
@@ -852,73 +852,74 @@
             self.db, 'ubiquity/install/title',
             'ubiquity/install/apt_indices_starting',
             'ubiquity/install/apt_indices')
-        cache = Cache()
-
-        if cache._depcache.broken_count > 0:
-            syslog.syslog(
-                'not installing additional packages, since there are broken '
-                'packages: %s' % ', '.join(broken_packages(cache)))
-            self.db.progress('STOP')
-            self.nested_progress_end()
-            return
-
-        for pkg in to_install:
-            mark_install(cache, pkg)
-
-        self.db.progress('SET', 1)
-        self.progress_region(1, 10)
-        if langpacks:
-            fetchprogress = DebconfAcquireProgress(
-                self.db, 'ubiquity/langpacks/title', None,
-                'ubiquity/langpacks/packages')
-            installprogress = DebconfInstallProgress(
-                self.db, 'ubiquity/langpacks/title',
-                'ubiquity/install/apt_info')
-        else:
-            fetchprogress = DebconfAcquireProgress(
-                self.db, 'ubiquity/install/title', None,
-                'ubiquity/install/fetch_remove')
-            installprogress = DebconfInstallProgress(
-                self.db, 'ubiquity/install/title',
-                'ubiquity/install/apt_info',
-                'ubiquity/install/apt_error_install')
-        chroot_setup(self.target)
-        commit_error = None
-        try:
+
+        with Cache() as cache:
+
+            if cache._depcache.broken_count > 0:
+                syslog.syslog(
+                    'not installing additional packages, since there are broken '
+                    'packages: %s' % ', '.join(broken_packages(cache)))
+                self.db.progress('STOP')
+                self.nested_progress_end()
+                return
+
+            for pkg in to_install:
+                mark_install(cache, pkg)
+
+            self.db.progress('SET', 1)
+            self.progress_region(1, 10)
+            if langpacks:
+                fetchprogress = DebconfAcquireProgress(
+                    self.db, 'ubiquity/langpacks/title', None,
+                    'ubiquity/langpacks/packages')
+                installprogress = DebconfInstallProgress(
+                    self.db, 'ubiquity/langpacks/title',
+                    'ubiquity/install/apt_info')
+            else:
+                fetchprogress = DebconfAcquireProgress(
+                    self.db, 'ubiquity/install/title', None,
+                    'ubiquity/install/fetch_remove')
+                installprogress = DebconfInstallProgress(
+                    self.db, 'ubiquity/install/title',
+                    'ubiquity/install/apt_info',
+                    'ubiquity/install/apt_error_install')
+            chroot_setup(self.target)
+            commit_error = None
             try:
-                if not self.commit_with_verify(cache,
-                                               fetchprogress, installprogress):
+                try:
+                    if not self.commit_with_verify(cache,
+                                                   fetchprogress, installprogress):
+                        fetchprogress.stop()
+                        installprogress.finishUpdate()
+                        self.db.progress('STOP')
+                        self.nested_progress_end()
+                        return
+                except IOError:
+                    for line in traceback.format_exc().split('\n'):
+                        syslog.syslog(syslog.LOG_ERR, line)
                     fetchprogress.stop()
                     installprogress.finishUpdate()
                     self.db.progress('STOP')
                     self.nested_progress_end()
                     return
-            except IOError:
-                for line in traceback.format_exc().split('\n'):
-                    syslog.syslog(syslog.LOG_ERR, line)
-                fetchprogress.stop()
-                installprogress.finishUpdate()
-                self.db.progress('STOP')
-                self.nested_progress_end()
-                return
-            except SystemError, e:
-                for line in traceback.format_exc().split('\n'):
-                    syslog.syslog(syslog.LOG_ERR, line)
-                commit_error = str(e)
-        finally:
-            chroot_cleanup(self.target)
-        self.db.progress('SET', 10)
-
-        cache.open(None)
-        if commit_error or cache._depcache.broken_count > 0:
-            if commit_error is None:
-                commit_error = ''
-            brokenpkgs = broken_packages(cache)
-            self.warn_broken_packages(brokenpkgs, commit_error)
-
-        self.db.progress('STOP')
-
-        self.nested_progress_end()
+                except SystemError, e:
+                    for line in traceback.format_exc().split('\n'):
+                        syslog.syslog(syslog.LOG_ERR, line)
+                    commit_error = str(e)
+            finally:
+                chroot_cleanup(self.target)
+            self.db.progress('SET', 10)
+
+            cache.open(None)
+            if commit_error or cache._depcache.broken_count > 0:
+                if commit_error is None:
+                    commit_error = ''
+                brokenpkgs = broken_packages(cache)
+                self.warn_broken_packages(brokenpkgs, commit_error)
+
+            self.db.progress('STOP')
+
+            self.nested_progress_end()
 
     def select_language_packs(self, save=False):
         try: