Merge lp:~jtv/maas-test/housekeeping into lp:maas-test
Status: | Merged |
---|---|
Approved by: | Jeroen T. Vermeulen |
Approved revision: | 104 |
Merged at revision: | 101 |
Proposed branch: | lp:~jtv/maas-test/housekeeping |
Merge into: | lp:maas-test |
Diff against target: |
134 lines (+34/-14) 3 files modified
docs/man/maas-test.8.rst (+8/-11) maastest/report.py (+3/-1) man/maas-test.8 (+23/-2) |
To merge this branch: | bzr merge lp:~jtv/maas-test/housekeeping |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Julian Edwards (community) | Approve | ||
Review via email: mp+200776@code.launchpad.net |
Commit message
Fix lint, update manpage.
Description of the change
Fixes several problems at once. Our generated manpage was out of date; we had lint in the code so a plain “make” or “make lint” would break; and due perhaps to some change in tooling the manpage no longer compiled from RST. The RST source for the manpage also had an extraneous heading accidentally inserted in it.
I didn't want to spend the time re-tweaking the levels of the section headings, which have to work right in both the man page and the HTML output; the change doesn't look too bad to me.
We have more problems: “make test” no longer works for me in a clean copy of trunk. But let's not get too much into one branch — this brings us some fixes now, and at least a plain “make” works again.
Jeroen
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
review: approve www.enigmail. net/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://
iEYEARECAAYFAlL NAgwACgkQWhGlTF 8G/Hc9kACeOoMi/ tGmrUdW58/ sK7VngAPn 6XVk07Iay5RTfX/ bd
lr0AnjvHXP0ovMg
=h5wc
-----END PGP SIGNATURE-----