Launchpad itself

Merge ~cjwatson/launchpad:testfix-stormify-archivedependency into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. testfix-stormify-archivedependency
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: e1daefc9f9390749db0bfe8522a889cf70d58711
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:testfix-stormify-archivedependency
Merge into: launchpad:master
Diff against target: 13 lines (+1/-1)
1 file modified
lib/lp/soyuz/templates/archive-index.pt (+1/-1)
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+392330@code.launchpad.net

Commit message

Adjust archive-index.pt for ArchiveDependency Storm conversion

Description of the change

Archive.dependencies now returns a ResultSet rather than a SQLObjectResultSet.

Fixes lib/lp/soyuz/stories/ppa/xx-edit-dependencies.txt and lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt test failures caused by https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/392161.

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/soyuz/templates/archive-index.pt b/lib/lp/soyuz/templates/archive-index.pt
2index 9a83a85..d67a632 100644
3--- a/lib/lp/soyuz/templates/archive-index.pt
4+++ b/lib/lp/soyuz/templates/archive-index.pt
5@@ -120,7 +120,7 @@ sudo apt-get update
6 <dd tal:content="signing_key/fingerprint"/>
7 </dl>
8 <div id="archive-dependencies"
9- tal:condition="context/dependencies">
10+ tal:condition="not: context/dependencies/is_empty">
11 <h3>Dependencies:</h3>
12 <ul>
13 <li tal:repeat="dependency context/dependencies">

Subscribers

People subscribed via source and target branches

to status/vote changes: