Merge lp:~gary/launchpad/ec2buildout into lp:launchpad

[Gary Poster]

Make running ec2 from a symlink more robust by having buildout generate the entry script.

This makes it so that, if you always use ec2 from devel to try and get the latest and greatest version while running your branch, it actually gets the new code even if there's a _pythonpath.py locally.

[Māris Fogels (mars)]

I tested this locally, and it works as expected. bin/ec2 works, utilities/ec2 works, 'make clean && make' work, and it merges cleanly with devel.

r=mars

review: Approve

=== modified file 'setup.py'
--- setup.py	2010-03-24 05:28:44 +0000
+++ setup.py	2010-06-09 14:18:28 +0000
@@ -137,6 +137,7 @@
             'twistd = twisted.scripts.twistd:run',
             'start_librarian '
                 '= canonical.launchpad.scripts.runlaunchpad:start_librarian',
+            'ec2 = devscripts.ec2test.entrypoint:main',
         ]
     ),
 )

=== modified file 'utilities/ec2'
--- utilities/ec2	2010-04-27 19:48:39 +0000
+++ utilities/ec2	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/usr/bin/python -S
-
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Executable for the ec2 scripts."""
-
-import _pythonpath
-
-__metaclass__ = type
-
-from devscripts.ec2test.entrypoint import main
-main()

=== target is u'../bin/ec2'