Merge lp://qastaging/~cjwatson/update-manager/binary-files into lp://qastaging/update-manager
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Merged at revision: | 2459 |
| Proposed branch: | lp://qastaging/~cjwatson/update-manager/binary-files |
| Merge into: | lp://qastaging/update-manager |
| Diff against target: |
241 lines (+48/-32) 12 files modified
DistUpgrade/DistUpgradeAptCdrom.py (+20/-14) DistUpgrade/DistUpgradePatcher.py (+1/-1) DistUpgrade/DistUpgradeQuirks.py (+2/-1) UpdateManager/Core/MetaRelease.py (+1/-1) UpdateManager/Core/MyCache.py (+1/-1) UpdateManager/Core/UpdateList.py (+4/-5) UpdateManager/DistUpgradeFetcher.py (+1/-1) UpdateManager/DistUpgradeFetcherKDE.py (+1/-1) debian/changelog (+6/-0) debian/control (+2/-2) tests/test_meta_release_core.py (+1/-1) tests/test_quirks.py (+8/-4) |
| To merge this branch: | bzr merge lp://qastaging/~cjwatson/update-manager/binary-files |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Evan (community) | Approve | ||
| Michael Vogt | Pending | ||
|
Review via email:
|
|||
Description of the change
Fix a number of cases where Python 3 requires us to distinguish more carefully between binary and text file I/O.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good!