Merge lp://staging/~dpb/ubuntu-manpage-repository/fix-search-order into lp://staging/ubuntu-manpage-repository
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Joshua Powers | ||||
| Approved revision: | 235 | ||||
| Merged at revision: | 219 | ||||
| Proposed branch: | lp://staging/~dpb/ubuntu-manpage-repository/fix-search-order | ||||
| Merge into: | lp://staging/ubuntu-manpage-repository | ||||
| Diff against target: |
64 lines (+8/-11) 3 files modified
README.md (+0/-3) cgi-bin/search.py (+7/-7) www/functions.js (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~dpb/ubuntu-manpage-repository/fix-search-order | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Joshua Powers (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix distro search order now that we have wrapped around the alphabet.
Description of the change
Testing instructions.
Download bionic and xenial sources, and try this link:
http://<ip>/manpages/
You will get pointed to Xenial, with the change from this branch, you should get bionic.
I have something set up to test if you would like to see the bug and reproduction. It needs access to the canonical VPN to validate:
http://
You can switch the code back and forth like this:
ssh ambipom
lxc exec manpages bash
cd /srv/manpages.
# old code:
bzr switch lp:ubuntu-manpage-repository
# new code:
bzr switch lp:~davidpbritton/ubuntu-manpage-repository/fix-search-order
# After switching:
bzr resolved --take-this bin/config
And then, you can try the link. Also, you'll notice that a general search for 'man' has the man page table in the right order.
| Joshua Powers (powersj) wrote | # |
| David Britton (dpb) | # |
| Joshua Powers (powersj) | # |
2 questions below