Merge lp:~michael.nelson/launchpad/ppa-deletion-oops into lp:launchpad/db-devel

Proposed by Michael Nelson on 2010-05-03
Status: Merged
Approved by: Michael Nelson on 2010-05-03
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~michael.nelson/launchpad/ppa-deletion-oops
Merge into: lp:launchpad/db-devel
Diff against target: 0 lines
To merge this branch: bzr merge lp:~michael.nelson/launchpad/ppa-deletion-oops
Reviewer Review Type Date Requested Status
Björn Tillenius (community) release-critical 2010-05-03 Approve on 2010-05-03
Tim Penhey (community) 2010-05-03 Approve on 2010-05-03
Review via email: mp+24580@code.launchpad.net

Commit message

Only disable an archive during deletion if it hasn't been disabled already.

Description of the change

This branch simply ensures that an archive is only disabled during PPA deletion if it hasn't already been disabled for some other reason.

Julian said:
{{{
However the fix to delete PPAs is a little busticated and results in OOPS on
edge.

https://bugs.edge.launchpad.net/soyuz/+bug/392887
https://lp-oops.canonical.com/oops.py/?oopsid=1581EB1167

Can someone get an r-c fix in for this please, it's a simple fix (check the
oops).
}}}

To post a comment you must log in.
Michael Nelson (michael.nelson) wrote :

Here's the diff (scanner will be apparently catching up for a while):
http://pastebin.ubuntu.com/426871/

Tim Penhey (thumper) wrote :

Strip the _bug_574246 from the method name, but good otherwise.

review: Approve
Björn Tillenius (bjornt) :
review: Approve (release-critical)

Preview Diff

Empty

Subscribers

People subscribed via source and target branches

to status/vote changes: