Merge lp:~lifeless/bzr-builder/setup into lp:bzr-builder

Proposed by Robert Collins
Status: Merged
Merged at revision: not available
Proposed branch: lp:~lifeless/bzr-builder/setup
Merge into: lp:bzr-builder
Diff against target: 32 lines (+13/-12)
1 file modified
setup.py (+13/-12)
To merge this branch: bzr merge lp:~lifeless/bzr-builder/setup
Reviewer Review Type Date Requested Status
James Westby Pending
Review via email: mp+20338@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

Guard setup.py for bzr-builder, as bzr-builddeb is.

Further work would be to declare the commands supported by builder, but this at least lets it get indexed safely.

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-01-13 02:13:56 +0000
3+++ setup.py 2010-03-01 04:59:09 +0000
4@@ -2,15 +2,16 @@
5
6 from distutils.core import setup
7
8-setup(name="bzr-builder",
9- version="0.2",
10- description="Turn a recipe in to a bzr branch",
11- author="James Westby",
12- author_email="james.westby@canonical.com",
13- license="GNU GPL v3",
14- url="http://launchpad.net/bzr-builder",
15- packages=['bzrlib.plugins.builder',
16- 'bzrlib.plugins.builder.tests',
17- ],
18- package_dir={'bzrlib.plugins.builder': '.'},
19- )
20+if __name__ == '__main__':
21+ setup(name="bzr-builder",
22+ version="0.2",
23+ description="Turn a recipe in to a bzr branch",
24+ author="James Westby",
25+ author_email="james.westby@canonical.com",
26+ license="GNU GPL v3",
27+ url="http://launchpad.net/bzr-builder",
28+ packages=['bzrlib.plugins.builder',
29+ 'bzrlib.plugins.builder.tests',
30+ ],
31+ package_dir={'bzrlib.plugins.builder': '.'},
32+ )

Subscribers

People subscribed via source and target branches