Launchpad itself

Merge lp:~lifeless/launchpad/librarian into lp:launchpad

Proposed by Robert Collins on 2010-09-10

Status:

Merged

Approved by:

Michael Hudson-Doyle on 2010-09-10

Approved revision:

no longer in the source branch.

Merged at revision:

11522

Proposed branch:

Merge into:

Diff against target:

1 file modified

lib/canonical/launchpad/database/librarian.py (+1/-1)

To merge this branch:

bzr merge lp:~lifeless/launchpad/librarian

Related bugs:

Bug #661009: rebooting buildbot slave environment doesn't remove test librarian pid	Medium	Fix Released
Bug #663165: librarian logs should be attached to tests	Low	Fix Released
Bug #692872: Test suite fails if previous run did not tear down Librarian fully.	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Hudson-Doyle		2010-09-10	Approve on 2010-09-10
Review via email: mp+35053@code.launchpad.net

Avoid unnecessary work FTW.

I'll also propose for a CP after we see how much it helps edge.

Michael Hudson-Doyle (mwhudson) wrote on 2010-09-10:

Seems fine. Is it really going to make a CP-worthy difference? Hard to say I guess. Anyway, a clear improvement.

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to status/vote changes:

1	=== modified file 'lib/canonical/launchpad/database/librarian.py'
2	--- lib/canonical/launchpad/database/librarian.py 2010-09-06 21:02:44 +0000
3	+++ lib/canonical/launchpad/database/librarian.py 2010-09-10 00:36:28 +0000
4	@@ -236,7 +236,7 @@
5
6	@property
7	def deleted(self):
8	- return self.content is None
9	+ return self.contentID is None
10
11	def __storm_invalidated__(self):
12	"""Make sure that the file is closed across transaction boundary."""