Ratings and Reviews server

Merge lp://staging/~zematynnad/rnr-server/architecture_688121 into lp://staging/rnr-server

architecture_688121
Merge into trunk

Proposed by Danny Tamez on 2011-01-20

Status:

Merged

Approved by:

David Owen on 2011-01-20

Approved revision:

107

Merged at revision:

113

Proposed branch:

lp://staging/~zematynnad/rnr-server/architecture_688121

Merge into:

lp://staging/rnr-server

Diff against target:

104 lines (+47/-6)

3 files modified

src/reviewsapp/forms.py (+6/-4)
src/reviewsapp/tests/test_rnrclient.py (+37/-0)
src/reviewsapp/utilities.py (+4/-2)

To merge this branch:

bzr merge lp://staging/~zematynnad/rnr-server/architecture_688121

Low

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Anthony Lenton (community)		Approve on 2011-01-26
David Owen (community)	2011-01-20	Approve on 2011-01-20
Review via email: mp+46972@code.staging.launchpad.net

Description of the change

Now also checking architecture when looking for a match in the database to verify the combo of distro, app, pkg, and arch - else checking with lp.

Revision history for this message

David Owen (dsowen) on 2011-01-20:

review: Approve

Revision history for this message

Anthony Lenton (elachuni) wrote on 2011-01-26:

I think as well as adding arch_tag as an optional argument to lp_verify_packagename_in_distro, you'd need to pass arch_tag in when you call the function, in forms.py (probably also adding the arch verification to the check in _validate_and_populate_software_item); could you check this?

review: Needs Fixing

Revision history for this message

Danny Tamez (zematynnad) wrote on 2011-01-26:

Michael, I modified the test to return a 302 instead of a 404 and ensured that we made it to the checkout url. Yes, those lines were doing what I wanted but for clarity I have changed them to the .add syntax.

lp://staging/~zematynnad/rnr-server/architecture_688121 updated on 2011-01-26

108. By Danny Tamez on 2011-01-26: Checking arch_tag as well when validating the existence of a package
109. By Danny Tamez on 2011-01-26: Merge from trunk

Revision history for this message

Danny Tamez (zematynnad) wrote on 2011-01-26:

Please ignore the above comment - typing in wrong window
I've added the arch_tag to the _validate_and_populate_software_item call to lp_verify_packagename