Ubuntu
ubuntu-core-upgrader package

Merge lp://staging/~jamesodhunt/ubuntu/vivid/ubuntu-core-upgrader/handle-invalid-removed-file into lp://staging/ubuntu/vivid/ubuntu-core-upgrader

  1. Vivid (15.04)
  2. handle-invalid-removed-file
  3. Merge into vivid
Proposed by James Hunt
Status: Merged
Merged at revision: 24
Proposed branch: lp://staging/~jamesodhunt/ubuntu/vivid/ubuntu-core-upgrader/handle-invalid-removed-file
Merge into: lp://staging/ubuntu/vivid/ubuntu-core-upgrader
Diff against target: 406 lines (+157/-56)
5 files modified
debian/changelog (+9/-0)
functional/test_upgrader.py (+78/-20)
ubuntucoreupgrader/tests/test_upgrader.py (+46/-10)
ubuntucoreupgrader/tests/utils.py (+6/-3)
ubuntucoreupgrader/upgrader.py (+18/-23)
To merge this branch: bzr merge lp://staging/~jamesodhunt/ubuntu/vivid/ubuntu-core-upgrader/handle-invalid-removed-file
Reviewer Review Type Date Requested Status
Michael Vogt (community) Needs Information
Review via email: mp+254372@code.staging.launchpad.net

Description of the change

* ubuntucoreupgrader/upgrader.py: Tolerate an invalid 'removed' file
  to avoid the upgrade failing attempting to remove '/writable/cache'
  (see LP: #1437225).

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for adding this bugfix. I think we should also include a regression test.

Revision history for this message
James Hunt (jamesodhunt) wrote :

Tests added.

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for adding the test. It runs fine.

One thing that is a odd is that if I revert the change in r23 (the bugfix for the empty file) and run the tests they still succeed. Is this intended?

Revision history for this message
James Hunt (jamesodhunt) wrote :

Branch updated. Phew...

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks, I put some suggestions inline.

lp://staging/~jamesodhunt/ubuntu/vivid/ubuntu-core-upgrader/handle-invalid-removed-file updated
26. By James Hunt

* Review changes.

Revision history for this message
James Hunt (jamesodhunt) wrote :

Thanks for reviewing - branch updated.

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks, looks good, one question about the strip() below seems to have slipped through, would be nice to get this clarified in some way. Otherwise fine and ready to go.

review: Needs Information
Revision history for this message
Michael Vogt (mvo) wrote :

I merged/resolved-conflicts/uploaded as per Steve.

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 all changes: