Merge lp://staging/~rockstar/launchpad/remove-sourcepackage-from-recipe into lp://staging/launchpad/db-devel

Proposed by Paul Hummer
Status: Merged
Approved by: Paul Hummer
Approved revision: no longer in the source branch.
Merged at revision: 9406
Proposed branch: lp://staging/~rockstar/launchpad/remove-sourcepackage-from-recipe
Merge into: lp://staging/launchpad/db-devel
Diff against target: 1966 lines (+472/-387)
39 files modified
database/sampledata/current-dev.sql (+79/-65)
database/sampledata/current.sql (+76/-62)
database/schema/comments.sql (+0/-2)
database/schema/patch-2207-58-0.sql (+12/-0)
lib/canonical/config/__init__.py (+4/-0)
lib/canonical/launchpad/readonly.py (+1/-1)
lib/canonical/launchpad/webapp/configure.zcml (+6/-0)
lib/canonical/launchpad/webapp/publication.py (+22/-18)
lib/canonical/launchpad/webapp/tales.py (+13/-0)
lib/canonical/launchpad/webapp/tests/test_publication.py (+8/-0)
lib/lp/archiveuploader/nascentupload.py (+1/-1)
lib/lp/archiveuploader/tests/test_recipeuploads.py (+3/-3)
lib/lp/buildmaster/manager.py (+4/-1)
lib/lp/buildmaster/tests/test_buildqueue.py (+29/-29)
lib/lp/buildmaster/tests/test_manager.py (+3/-1)
lib/lp/code/browser/sourcepackagerecipe.py (+1/-4)
lib/lp/code/browser/tests/test_sourcepackagerecipe.py (+9/-16)
lib/lp/code/interfaces/sourcepackagerecipe.py (+1/-9)
lib/lp/code/interfaces/sourcepackagerecipebuild.py (+2/-8)
lib/lp/code/model/recipebuilder.py (+9/-10)
lib/lp/code/model/sourcepackagerecipe.py (+4/-12)
lib/lp/code/model/sourcepackagerecipebuild.py (+3/-9)
lib/lp/code/model/tests/test_recipebuilder.py (+9/-9)
lib/lp/code/model/tests/test_sourcepackagerecipe.py (+7/-15)
lib/lp/code/model/tests/test_sourcepackagerecipebuild.py (+1/-2)
lib/lp/registry/interfaces/person.py (+1/-4)
lib/lp/registry/model/person.py (+2/-4)
lib/lp/soyuz/browser/builder.py (+11/-1)
lib/lp/soyuz/browser/tests/test_builder_views.py (+49/-0)
lib/lp/soyuz/doc/nascentupload-announcements.txt (+3/-3)
lib/lp/soyuz/doc/package-diff.txt (+31/-31)
lib/lp/soyuz/doc/publishing.txt (+4/-4)
lib/lp/soyuz/model/packagediff.py (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-package-diff.txt (+13/-13)
lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt (+28/-2)
lib/lp/soyuz/templates/distroseries-queue.pt (+14/-0)
lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-extra.pt (+1/-14)
lib/lp/soyuz/templates/sourcepackagerelease-diffs.pt (+1/-13)
lib/lp/testing/factory.py (+6/-20)
To merge this branch: bzr merge lp://staging/~rockstar/launchpad/remove-sourcepackage-from-recipe
Reviewer Review Type Date Requested Status
Curtis Hovey (community) rc Approve
Tim Penhey (community) Approve
Björn Tillenius (community) db Approve
Stuart Bishop (community) db Approve
Review via email: mp+25809@code.staging.launchpad.net

Description of the change

This branch fixes bug 513201. After much deliberation, we've decided that ISourcePackageRecipeBuild.sourcepackagename and ISourcePackageRecipe.sourcepackagename are unnecessary. This branch removes them from the interfaces, models, database, and a WHOLE bunch of places where it's used (mostly in test data).

The reason we can remove it is because this information is already in available in the packaging data provided by the branches. Having it in two places leaves the potential for confusion when the user sets the sourcepackagename different than the packaging data.

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

DB patch is fine. patch-2207-58-0.sql

What version of PostgreSQL are you using? The sampledata patch is huge, which happens when someone uses a different version of PG than the last version used.

review: Approve (db)
Revision history for this message
Björn Tillenius (bjornt) wrote :

+1 on the db patch. -1 on the sampledata changes. Please make sure that you're using Postgres 8.4 and re-generate the sampledata using that (at least I think the current one is generated with 8.4). Otherwise we'll keep getting these unreadable diffs.

review: Approve (db)
Revision history for this message
Paul Hummer (rockstar) wrote :

So, launchpad-developer-dependencies still depends on 8.3, not 8.4. Also, the wiki page at https://dev.launchpad.net/DatabaseSetup is out of date (but I'll update it shortly).

Revision history for this message
Paul Hummer (rockstar) wrote :

The diff is still oddly large, but not as large as before...

Revision history for this message
Tim Penhey (thumper) wrote :

The changes look good to me.

review: Approve
Revision history for this message
Curtis Hovey (sinzui) wrote :

I am providing a pre-emptive RC to release the stress of this landing late via ec2.

review: Approve (rc)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: