Merge lp:~lifeless/bzrtools/setup into lp:bzrtools

[Robert Collins]

[Robert Collins (lifeless)]

Guard setup.py from executing setup unless it was actually executed, not just imported.

This is useful for bzr-plugin-info ( see http://doc.bazaar.canonical.com/bzr.dev/developers/plugin-api.html#plugin-metadata-before-installation).

[Robert Collins (lifeless)]

I was in a movie an hour ago - I'm not sure whats going on here.

[Tim Penhey (thumper)]

lp:~lifeless/bzrtools/setup has not been pushed to, so the old job runner would never have run the original job. Now the diff timed out (you should have an email for that too), and the creation email sent.

[Aaron Bentley (abentley)]

I categorically refuse to merge empty branches!

review: Disapprove

[Robert Collins (lifeless)]

Try now, sorry!

[Robert Collins (lifeless)]

Ping (I am patch piloting this week and saw this is still neither in-or-out - lp has a proper diff for it now though).

=== modified file 'setup.py'
--- setup.py	2008-02-13 04:58:32 +0000
+++ setup.py	2010-05-06 04:09:26 +0000
@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 from distutils.core import setup
 import version
-setup(name="BzrTools",
-      version=version.__version__,
-      description="Handy utilities for working with Bazaar (bzr).",
-      author="Aaron Bentley",
-      author_email="[e-mail]",
-      license = "GNU GPL v2",
-      url="http://bazaar-vcs.org/BzrTools",
-      packages=['bzrlib.plugins.bzrtools', 'bzrlib.plugins.bzrtools.tests'],
-      package_dir={'bzrlib.plugins.bzrtools': '.', })
+if __name__ == '__main__':
+    setup(name="BzrTools",
+          version=version.__version__,
+          description="Handy utilities for working with Bazaar (bzr).",
+          author="Aaron Bentley",
+          author_email="[e-mail]",
+          license = "GNU GPL v2",
+          url="http://bazaar-vcs.org/BzrTools",
+          packages=['bzrlib.plugins.bzrtools', 'bzrlib.plugins.bzrtools.tests'],
+          package_dir={'bzrlib.plugins.bzrtools': '.', })