bzr-grep

Merge lp:~gz/bzr-grep/make_setup_actually_do_something into lp:bzr-grep

  1. make_setup_actually_do_something
  2. Merge into trunk
Proposed by Martin Packman
Status: Merged
Approved by: Parth Malwankar
Approved revision: 136
Merged at revision: 136
Proposed branch: lp:~gz/bzr-grep/make_setup_actually_do_something
Merge into: lp:bzr-grep
Diff against target: 20 lines (+3/-3)
1 file modified
setup.py (+3/-3)
To merge this branch: bzr merge lp:~gz/bzr-grep/make_setup_actually_do_something
Reviewer Review Type Date Requested Status
Parth Malwankar Approve
Review via email: mp+26983@code.launchpad.net

Description of the change

Fix the `if __name__ == "__main__":` statement in setup.py so it actually does something, and change the paths to point to the right place for a bzr plugin install.

Haven't done a NEWS entry as this is pretty trivial, and just the other two branches from me will probably be conflict enough. :)

To post a comment you must log in.
Revision history for this message
Parth Malwankar (parthm) wrote :

Looks good to me.

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 2010-05-23 05:10:32 +0000
3+++ setup.py 2010-06-07 20:39:23 +0000
4@@ -7,7 +7,7 @@
5
6 bzr_commands = ['grep']
7
8-if __name__ == 'main':
9+if __name__ == '__main__':
10 setup(name="bzr grep",
11 version="0.3",
12 description="Print lines matching pattern for specified "
13@@ -16,5 +16,5 @@
14 author_email="bazaar@lists.canonical.com",
15 license = "GNU GPL v2",
16 url="https://launchpad.net/bzr-grep",
17- packages=['grep'],
18- package_dir={'grep': '.'})
19+ packages=['bzrlib.plugins.grep'],
20+ package_dir={'bzrlib.plugins.grep': '.'})

Subscribers

People subscribed via source and target branches