Merge lp:~hloeung/bzr/mailname-first-line into lp:bzr
Proposed by
Haw Loeung
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6542 |
Proposed branch: | lp:~hloeung/bzr/mailname-first-line |
Merge into: | lp:bzr |
Diff against target: |
107 lines (+42/-9) 3 files modified
bzrlib/config.py (+3/-3) bzrlib/tests/test_config.py (+35/-4) doc/en/release-notes/bzr-2.6.txt (+4/-2) |
To merge this branch: | bzr merge lp:~hloeung/bzr/mailname-first-line |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Approve | ||
Haw Loeung | Pending | ||
Review via email: mp+116142@code.launchpad.net |
This proposal supersedes a proposal from 2012-07-20.
Commit message
Only read the first line from /etc/mailname.
Description of the change
Read only the first line from /etc/mailname. This makes it consistent with postfix and allows us to append our puppet warning headers.
To post a comment you must log in.
Thanks for the fix; the change looks reasonable. It would be good to have a test for it so we can be sure this won't regress in the future.