Merge lp://qastaging/~barry/ubuntu-release-upgrader/lp1485093 into lp://qastaging/ubuntu-release-upgrader
Proposed by
Barry Warsaw
| Status: | Merged |
|---|---|
| Merged at revision: | 2924 |
| Proposed branch: | lp://qastaging/~barry/ubuntu-release-upgrader/lp1485093 |
| Merge into: | lp://qastaging/ubuntu-release-upgrader |
| Diff against target: |
59 lines (+21/-4) 4 files modified
DistUpgrade/DistUpgradeCache.py (+1/-1) DistUpgrade/DistUpgradeQuirks.py (+10/-1) debian/changelog (+10/-0) debian/python3-distupgrade.links (+0/-2) |
| To merge this branch: | bzr merge lp://qastaging/~barry/ubuntu-release-upgrader/lp1485093 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Core Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
This fixes the imports to not be relative so that it's okay if the symlinks don't exist. Don't create the symlinks in the package install because if the dependent packages aren't installed, the symlinks will be dangling which breaks other packages, specifically pex's build.
Instead, just handle the ImportErrors that can happen if the dependent packages, imported via absolute path, don't exist.
To post a comment you must log in.
Revision history for this message
| Brian Murray (brian-murray) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This looks fine although, and I'll merge it at the start of X.