Merge lp:~glatzor/aptdaemon/maverik-updates into lp:ubuntu/maverick-updates/aptdaemon

[Sebastian Heinlein]

[Sebastian Heinlein (glatzor)]

Hello Michael,

The changes would allow me to gather more information about common exceptions in aptdaemon. It would be of great help to have it in maverick-updates soon.

Cheers,

Sebastian

[Michael Vogt (mvo)]

On Fri, Jan 21, 2011 at 09:20:21PM -0000, Sebastian Heinlein wrote:
> Hello Michael,
>
> The changes would allow me to gather more information about common exceptions in aptdaemon. It would be of great help to have it in maverick-updates soon.

Many thanks! I uploaded this to maverick-proposed now (had to fix the
prefix level of the patch for quilt, but otherwise no issues).

Thanks,
 michael

> Cheers,
>
> Sebastian
> --
> https://code.launchpad.net/~glatzor/aptdaemon/maverik-updates/+merge/47067
> You are requested to review the proposed merge of lp:~glatzor/aptdaemon/maverik-updates into lp:ubuntu/maverick-updates/aptdaemon.

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-11 11:00:50 +0000
+++ debian/changelog	2011-01-21 18:23:27 +0000
@@ -1,3 +1,18 @@
+aptdaemon (0.31+bzr506-0ubuntu6) maverick-proposed; urgency=low
+
+  * debian/patches/10_improve_error_reporting.patch:
+    - There are currently three errors which don't provide enough information
+      to be fixed:
+      Sometimes installation of local package files fails. This patch raises a 
+      PACKAGE_MANAGER_FAILED error instead of an unknown one in this case and
+      adds the output of the dpkg call to the error (e.g. LP: #665722).
+      Furthermore the TransactionFailed exception doesn't show the
+      details and the code by default (LP: #665218).
+      The message of lock.LockFailedError doesn't contain the lock file path
+      and the blocking process (LP: #665572).
+
+ -- Sebastian Heinlein <[e-mail]>  Fri, 21 Jan 2011 15:00:59 +0100
+
 aptdaemon (0.31+bzr506-0ubuntu5) maverick-proposed; urgency=low
 
   * debian/patches/09_fix_index_race_659438.patch:

=== added file 'debian/patches/10_improve_error_reporting.patch'
--- debian/patches/10_improve_error_reporting.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/10_improve_error_reporting.patch	2011-01-21 18:23:27 +0000
@@ -0,0 +1,106 @@
+Description: Provide more error details
+ There are currently three errors which don't provide enough information
+ to be fixed:
+ Sometimes installation of local package files fails. This patch raises a 
+ PACKAGE_MANAGER_FAILED error instead of an unknown one in this case and
+ adds the output of the dpkg call to the error (e.g. LP: #665722).
+ Furthermore the TransactionFailed exception doesn't show the
+ details and the code by default (LP: #665218).
+ The message of lock.LockFailedError doesn't contain the lock file path
+ and the blocking process (LP: #665572).
+Author: Sebastian Heinlein <[e-mail]>
+Origin: other
+=== modified file 'aptdaemon/core.py'
+--- aptdaemon/core.py	2010-09-16 09:11:50 +0000
++++ aptdaemon/core.py	2011-01-21 14:13:38 +0000
+@@ -202,6 +202,7 @@
+                                                      self._sender_owner_changed)
+         else:
+             self._sender_watch = None
++        self.output = ""
+ 
+     def _sender_owner_changed(self, connection):
+         """Callback if the owner of the original sender changed, e.g.
+
+=== modified file 'aptdaemon/errors.py'
+--- aptdaemon/errors.py	2010-08-24 09:00:36 +0000
++++ aptdaemon/errors.py	2011-01-21 14:05:05 +0000
+@@ -30,6 +30,8 @@
+ import dbus
+ from functools import wraps
+ 
++import aptdaemon.enums
++
+ 
+ class AptDaemonError(dbus.DBusException):
+ 
+@@ -70,6 +72,11 @@
+         self.code = code
+         self.details = details
+ 
++    def __str__(self):
++        return "Transaction failed: %s\n%s" % \
++               (aptdaemon.enums.get_role_error_from_enum(self.code),
++                self.details)
++
+ 
+ class InvalidMetaDataError(AptDaemonError):
+ 
+
+=== modified file 'aptdaemon/lock.py'
+--- aptdaemon/lock.py	2010-12-11 11:00:50 +0000
++++ aptdaemon/lock.py	2011-01-21 17:58:58 +0000
+@@ -40,7 +40,11 @@
+         flock -- the path of the file lock
+         process -- the process which holds the lock or None
+         """
+-        Exception.__init__(self)
++        if process:
++            msg = "%s is already locked by %s" % (flock, process)
++        else:
++            msg = "Failed to lock %s" % flock
++        Exception.__init__(self, msg)
+         self.flock = flock
+         self.process = process
+ 
+
+=== modified file 'aptdaemon/worker.py'
+--- aptdaemon/worker.py	2010-12-11 11:00:50 +0000
++++ aptdaemon/worker.py	2011-01-21 14:30:50 +0000
+@@ -463,9 +463,12 @@
+             self._commit_changes(fetch_range=(5, 33),
+                                  install_range=(34, 63))
+         # Install the dpkg file
+-        if deb.install(DaemonDpkgInstallProgress(self.trans,
+-                                                 begin=64, end=95)):
+-            raise TransactionFailed(ERROR_UNKNOWN, deb._failure_string)
++        deb_progress = DaemonDpkgInstallProgress(self.trans, begin=64, end=95)
++        res = deb.install(deb_progress)
++        self.trans.output += deb_progress.output.decode("UTF-8", "ignore")
++        if res:
++            raise TransactionFailed(ERROR_PACKAGE_MANAGER_FAILED,
++                                    self.trans.output)
+ 
+     def remove_packages(self, package_names):
+         """Remove packages.
+@@ -627,6 +630,7 @@
+         progress.start_update()
+         progress.run()
+         progress.finish_update()
++        self.trans.output += progress.output.decode("UTF-8", "ignore")
+         if progress._child_exit != 0:
+             raise TransactionFailed(ERROR_PACKAGE_MANAGER_FAILED,
+                                     progress.output)
+@@ -749,8 +753,11 @@
+             progress.run()
+             progress.finish_update()
+             output = inst_progress.output + progress.output
++            self.trans.output += output.decode("UTF-8", "ignore")
+             raise TransactionFailed(ERROR_PACKAGE_MANAGER_FAILED,
+                                     "%s: %s" % (excep, output))
++        else:
++            self.trans.output += inst_progress.output.decode("UTF-8", "ignore")
+ 
+     def simulate(self, trans, status_path=None):
+         """Return the dependencies which will be installed by the transaction,
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-12-11 11:00:50 +0000
+++ debian/patches/series	2011-01-21 18:23:27 +0000
@@ -3,3 +3,4 @@
 07_fix-race-597017.patch
 08_fix_deb_install.patch
 09_fix_index_race_659438.patch
+10_improve_error_reporting.patch