Merge lp:~wookey/xdeb/xdeb-apt-download into lp:xdeb
Status: | Merged |
---|---|
Merged at revision: | 291 |
Proposed branch: | lp:~wookey/xdeb/xdeb-apt-download |
Merge into: | lp:xdeb |
Diff against target: |
113 lines (+19/-27) (has conflicts) 4 files modified
debian/changelog (+4/-0) debian/control (+1/-1) xdeb.cfg (+12/-12) xdeb.py (+2/-14) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp:~wookey/xdeb/xdeb-apt-download |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson | Approve | ||
Review via email:
|
Description of the change
This replaces the wget mechanism for downloading build-arch binaries with apt-download.
This fixes the 'tries to download package from wrong repo' issue
https:/
This fix also solves a number of other problems:
1) Removes the only difference between Debian and Ubuntu versions (the native_
2) Allows all uses of apt config/preferences when downloading binaries (pinning, multiple repos, default-release etc), which makes the tool much more flexible
3) Probably fixes mismatched binary/source download issue: https:/
As discussed on IRC, we do need to keep the wget option for a while because apt-get download requires you to have multiarch configured (which breaks non-native- import- based builds because xdeb has only been half-converted for multiarch), which regrettably means keeping the native_ import_ source option for now. However, we can make this conditional on whether you have multiarch configured or not, so that you can still get the benefits. I've made appropriate tweaks and merged this into my new-resolver branch (staged for trunk once apt 0.8.16~exp5ubuntu11 has been built and published).