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

[Sebastian Heinlein]

Mvo, could you please merge this branch, since I get 10 bug reports about this race every day.

Unmerged revisions

49. By Sebastian Heinlein on 2010-12-13

* debian/patches/09_fix_index_race_659438.patch:
  - If the background cron job rebuilds the apt indexes the
    apt.Cache.required_download method fails, since it tries to access
    the not available indexes. This patch is a workaround since it
    is requires a lock on the indexes before caluclating the size
    (fixes LP: #659438)

48. By Michael Vogt on 2010-10-20

* debian/patches/06_rosetta_po_update.patch:
  - updated translations from rosetta, this includes the
    policy.in files that can not be updated via language-packs
    (LP: #655642)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-10-20 10:12:52 +0000
+++ .pc/applied-patches	2010-12-14 06:06:12 +0000
@@ -2,3 +2,4 @@
 06_rosetta_po_update.patch
 07_fix-race-597017.patch
 08_fix_deb_install.patch
+09_fix_index_race_659438.patch

=== modified file 'aptdaemon/lock.py'
--- aptdaemon/lock.py	2010-10-05 18:04:52 +0000
+++ aptdaemon/lock.py	2010-12-14 06:06:12 +0000
@@ -19,7 +19,8 @@
 
 __author__  = "Sebastian Heinlein <[e-mail]>"
 
-__all__ = ("LockFailedError", "system")
+__all__ = ("LockFailedError", "lists_lock", "status_lock", "archive_lock",
+           "acquire", "release", "FileLock")
 
 import fcntl
 import os

=== modified file 'aptdaemon/worker.py'
--- aptdaemon/worker.py	2010-10-20 10:12:52 +0000
+++ aptdaemon/worker.py	2010-12-14 06:06:12 +0000
@@ -765,13 +765,23 @@
         log.info("Simulating trans: %s" % trans.tid)
         trans.status = STATUS_RESOLVING_DEP
         try:
+            lock.lists_lock.acquire()
             return self._simulate_helper(trans, status_path)
+        except lock.LockFailedError, error:
+            if error.process:
+                msg = "The package indexes are currently changed " \
+                      "by %s." % error.process
+            else:
+                msg = "Another package manager changes the package indexes" \
+                      "currently."
+            trans.error = TransactionFailed(ERROR_NO_LOCK, msg)
         except TransactionFailed, excep:
             trans.error = excep
         except Exception, excep:
             trans.error = TransactionFailed(ERROR_UNKNOWN,
                                             traceback.format_exc())
         finally:
+            lock.lists_lock.release()
             trans.status = STATUS_SETTING_UP
         trans.exit = EXIT_FAILED
         trans.progress = 100

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-20 10:12:52 +0000
+++ debian/changelog	2010-12-14 06:06:12 +0000
@@ -1,3 +1,14 @@
+aptdaemon (0.31+bzr506-0ubuntu5) maverick-proposed; urgency=low
+
+  * debian/patches/09_fix_index_race_659438.patch:
+    - If the background cron job rebuilds the apt indexes the
+      apt.Cache.required_download method fails, since it tries to access
+      the not available indexes. This patch is a workaround since it
+      is requires a lock on the indexes before caluclating the size
+      (LP: #659438)
+
+ -- Sebastian Heinlein <[e-mail]>  Sat, 11 Dec 2010 11:00:50 +0100
+
 aptdaemon (0.31+bzr506-0ubuntu4) maverick-proposed; urgency=low
 
   * debian/patches/06_rosetta_po_update.patch: 

=== added file 'debian/patches/09_fix_index_race_659438.patch'
--- debian/patches/09_fix_index_race_659438.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/09_fix_index_race_659438.patch	2010-12-14 06:06:12 +0000
@@ -0,0 +1,52 @@
+Description: Lock list indexes before performing a simulate
+ The apt.Cache.required_download properties accesses the list indexes.
+ If the indexes are currently recreated/updated by e.g. an background
+ cron job this will result in the following error:
+ SystemError: I wasn't able to locate file for the XXX package.
+ This might mean you need to manually fix this package.
+Author: Sebastian Heinlein <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/aptdaemon/+bug/659438
+Origin: other
+
+Index: maverick-updates/aptdaemon/worker.py
+===================================================================
+--- maverick-updates.orig/aptdaemon/worker.py	2010-12-11 10:57:03.732132000 +0100
++++ maverick-updates/aptdaemon/worker.py	2010-12-13 06:07:02.747673948 +0100
+@@ -765,13 +765,23 @@
+         log.info("Simulating trans: %s" % trans.tid)
+         trans.status = STATUS_RESOLVING_DEP
+         try:
++            lock.lists_lock.acquire()
+             return self._simulate_helper(trans, status_path)
++        except lock.LockFailedError, error:
++            if error.process:
++                msg = "The package indexes are currently changed " \
++                      "by %s." % error.process
++            else:
++                msg = "Another package manager changes the package indexes" \
++                      "currently."
++            trans.error = TransactionFailed(ERROR_NO_LOCK, msg)
+         except TransactionFailed, excep:
+             trans.error = excep
+         except Exception, excep:
+             trans.error = TransactionFailed(ERROR_UNKNOWN,
+                                             traceback.format_exc())
+         finally:
++            lock.lists_lock.release()
+             trans.status = STATUS_SETTING_UP
+         trans.exit = EXIT_FAILED
+         trans.progress = 100
+Index: maverick-updates/aptdaemon/lock.py
+===================================================================
+--- maverick-updates.orig/aptdaemon/lock.py	2010-12-13 06:07:15.179672286 +0100
++++ maverick-updates/aptdaemon/lock.py	2010-12-13 06:08:58.459685399 +0100
+@@ -19,7 +19,8 @@
+ 
+ __author__  = "Sebastian Heinlein <[e-mail]>"
+ 
+-__all__ = ("LockFailedError", "system")
++__all__ = ("LockFailedError", "lists_lock", "status_lock", "archive_lock",
++           "acquire", "release", "FileLock")
+ 
+ import fcntl
+ import os

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-10-20 10:12:52 +0000
+++ debian/patches/series	2010-12-14 06:06:12 +0000
@@ -2,3 +2,4 @@
 06_rosetta_po_update.patch
 07_fix-race-597017.patch
 08_fix_deb_install.patch
+09_fix_index_race_659438.patch