Quickly

Merge lp://staging/~robert-ancell/quickly/drop-lpi into lp://staging/quickly

  1. drop-lpi
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 668
Merged at revision: 684
Proposed branch: lp://staging/~robert-ancell/quickly/drop-lpi
Merge into: lp://staging/quickly
Diff against target: 541 lines (+0/-395)
6 files modified
data/templates/ubuntu-application/internal/apportutils.py (+0/-57)
data/templates/ubuntu-application/project_root/python_lib/Window.py (+0/-11)
data/templates/ubuntu-application/test/apport/TestProjectWindow.py.no_lpi (+0/-102)
data/templates/ubuntu-application/test/apport/apport.sh (+0/-84)
data/templates/ubuntu-application/test/apportutils.py (+0/-140)
data/templates/ubuntu-application/upgrade.py (+0/-1)
To merge this branch: bzr merge lp://staging/~robert-ancell/quickly/drop-lpi
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Needs Fixing
Review via email: mp+105735@code.staging.launchpad.net

Description of the change

Remove Launchpad integration. It will be removed in Quantal:
https://blueprints.launchpad.net/ubuntu/+spec/desktop-q-gnome-plans-review

Not sure if this branch does enough, and also the packaging needs to be updated to drop the dependency.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

that looks good. Nice work Robert!

I think you did all what is needed apart from giving an upgrade story.
Can you try to add an upgrade path to data/templates/ubuntu-application/upgrade.py to remove it (if the stenza is found) on project upgrade?
You should "just" need to remove bump the version of the template and remove the lpi lines if you find them anywhere on the project directory.

review: Needs Fixing
Revision history for this message
Michael Terry (mterry) wrote :

Didier, does this need to remove the code on upgrade? It's harmless if the module isn't present (ignores the exception).

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

@Michael: you are right, but that means that we will still install it if the application packaging was generated on a machine that have LPI, it will be pulled on the user's machine for nothing, wdyt?

Revision history for this message
Michael Terry (mterry) wrote :

Fair.

I have a branch I'm about to propose that will help with such upgrade.py issues (the branch will finally actually keep bin/, setup.py, and python_lib/ up to date with the latest versions automatically, so we don't have to keep managing upgrade.py ourselves for the quickly-owned code).

I'll base it off this branch because there is actually some overlapping changes in the apport test. So if the upgrade branch gets approval, this can land too, because it will get upgrade support automatically.

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

I'm approving this one then, please feel free to merge it altogether with your test branch

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