Merge ~cjwatson/launchpad:testfix-stormify-xpph-queries into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 7e2270421753be20128685568afb5d4057418c4d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:testfix-stormify-xpph-queries
Merge into: launchpad:master
Diff against target: 14 lines (+2/-2)
1 file modified
lib/lp/registry/model/distributionmirror.py (+2/-2)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+394881@code.launchpad.net

Commit message

Fix query in MirrorDistroArchSeries.getLatestPublishingEntry

Description of the change

I broke this by converting publishing history queries to Storm.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/registry/model/distributionmirror.py b/lib/lp/registry/model/distributionmirror.py
2index 11f2b13..5c5595e 100644
3--- a/lib/lp/registry/model/distributionmirror.py
4+++ b/lib/lp/registry/model/distributionmirror.py
5@@ -848,8 +848,8 @@ class MirrorDistroArchSeries(SQLBase, _MirrorSeriesMixIn):
6
7 if deb_only:
8 clauses.extend([
9- BinaryPackagePublishingHistory.binarypackagerelease ==
10- BinaryPackageFile.binarypackagerelease,
11+ BinaryPackagePublishingHistory.binarypackagereleaseID ==
12+ BinaryPackageFile.binarypackagereleaseID,
13 BinaryPackageFile.filetype == BinaryPackageFileType.DEB,
14 ])
15

Subscribers

People subscribed via source and target branches

to status/vote changes: