loggerhead

Merge lp:~jelmer/loggerhead/remove-loggerhead.conf.example into lp:loggerhead

  1. remove-loggerhead.conf.example
  2. Merge into trunk-rich
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: 469
Merged at revision: 469
Proposed branch: lp:~jelmer/loggerhead/remove-loggerhead.conf.example
Merge into: lp:loggerhead
Diff against target: 13 lines (+1/-2)
1 file modified
setup.py (+1/-2)
To merge this branch: bzr merge lp:~jelmer/loggerhead/remove-loggerhead.conf.example
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Loggerhead Reviewers Pending
Review via email: mp+93733@code.launchpad.net

Description of the change

setup.py was still trying to install loggerhead.conf.example, even after it had been removed.

This removes it from setup.py as well, and fixes "setup.py install".

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2012-02-02 04:58:46 +0000
3+++ setup.py 2012-02-19 14:46:19 +0000
4@@ -68,8 +68,7 @@
5 "static/images/*"]},
6 data_files = [
7 ('share/man/man1', ['serve-branches.1']),
8- ('share/doc/loggerhead', ['loggerhead.conf.example',
9- 'apache-loggerhead.conf',
10+ ('share/doc/loggerhead', ['apache-loggerhead.conf',
11 'bazaar.conf']),
12 ],
13 )

Subscribers

People subscribed via source and target branches