Merge lp:~mvo/software-center/lp1063595 into lp:software-center

[Michael Vogt]

Add a bunch of missing trans vars to ensure that _on_trans_error() is
always called with valid parameters and not crashing with unbound local
errors.

=== modified file 'softwarecenter/backend/installbackend_impl/aptd.py'
--- softwarecenter/backend/installbackend_impl/aptd.py	2012-10-05 08:39:29 +0000
+++ softwarecenter/backend/installbackend_impl/aptd.py	2012-10-08 08:11:21 +0000
@@ -260,6 +260,7 @@
 
     @inline_callbacks
     def fix_broken_depends(self):
+        trans = None
         try:
             trans = yield self.aptd_client.fix_broken_depends(defer=True)
             self.emit("transaction-started", "", "", trans.tid,
@@ -270,6 +271,7 @@
 
     @inline_callbacks
     def fix_incomplete_install(self):
+        trans = None
         try:
             trans = yield self.aptd_client.fix_incomplete_install(defer=True)
             self.emit("transaction-started", "", "", trans.tid,
@@ -285,6 +287,7 @@
         """ upgrade a single package """
         pkgname = app.pkgname
         appname = app.appname
+        trans = None
         try:
             trans = yield self.aptd_client.upgrade_packages([pkgname],
                                                             defer=True)
@@ -327,6 +330,7 @@
         """ remove a single package """
         pkgname = app.pkgname
         appname = app.appname
+        trans = None
         try:
             trans = yield self.aptd_client.remove_packages([pkgname],
                                                            defer=True)
@@ -399,6 +403,7 @@
         """ install and remove add-ons """
         pkgname = app.pkgname
         appname = app.appname
+        trans = None
         try:
             install = addons_install
             remove = addons_remove
@@ -421,6 +426,7 @@
         # aptsources will just enable it instead of adding a extra
         # sources.list.d file (LP: #666956)
         d = apt_pkg.config.find_dir("Dir::Etc::sourceparts")
+        trans = None
         if (not sources_list or
             not os.path.exists(os.path.join(d, sources_list))):
             sources_list = ""
@@ -436,6 +442,7 @@
     @inline_callbacks
     def enable_component(self, component):
         self._logger.debug("enable_component: %s" % component)
+        trans = None
         try:
             trans = yield self.aptd_client.enable_distro_component(component)
             # don't use self._run_transaction() here, to avoid sending uneeded
@@ -449,6 +456,7 @@
 
     @inline_callbacks
     def enable_channel(self, channelfile):
+        trans = None
         # read channel file and add all relevant lines
         for line in open(channelfile):
             line = line.strip()
@@ -476,6 +484,7 @@
             keyid = keyid.split("/")[1]
         if not keyid.startswith("0x"):
             keyid = "0x%s" % keyid
+        trans = None
         try:
             trans = yield self.aptd_client.add_vendor_key_from_keyserver(
                 keyid, keyserver, defer=True)
@@ -497,6 +506,7 @@
 
         args = (entry.type, entry.uri, entry.dist, entry.comps,
                 "Added by software-center", sourcepart)
+        trans = None
         try:
             trans = yield self.aptd_client.add_repository(*args, defer=True)
             yield self._run_transaction(trans, None, None, None)
@@ -523,7 +533,7 @@
         self._logger.debug(
             "adding license_key for pkg '%s' of len: %i" % (
                 pkgname, len(license_key)))
-
+        trans = None
         # HOME based license keys
         if license_key_path and license_key_path.startswith("~"):
             # check if its inside HOME and if so, just create it