Merge lp:~bac/lpsetup/setup_x into lp:lpsetup

[Brad Crittenden]

Check to ensure the interpreter for lpsetup/bin/launchpad-database-setup.sh is what is expected before invoking it.

Our work-around for having the execute bits stripped from lpsetup/bin/launchpad-database-setup.sh requires us to specify the interpreter manually. In order to be safe, we check to ensure it is what we expect.

[Brad Crittenden (bac)]

Self-reviewing as this was the approach suggested in an earlier review.

review: Approve (code)

[Launchpad QA Bot (lpqabot)]

The attempt to merge lp:~bac/lpsetup/setup_x into lp:lpsetup failed. Below is the output from the failed tests.

lxc.aa_profile = lxc-container-with-nesting
WARNING: this command will destroy the 'lpsetup-testing-lxc' environment (type: local).
This includes all machines, services, data, and other resources. Continue [y/N]**********************************************************************
* Checking test environment. *
**********************************************************************
**********************************************************************
* Setting up the test environment for LXC container. *
**********************************************************************
----------------------------------------------------------------------
check_call:
juju bootstrap -e lpsetup-testing-lxc
----------------------------------------------------------------------
**********************************************************************
None
**********************************************************************
**********************************************************************
* Cleaning up. *
**********************************************************************

**********************************************************************
* Run time: 0:02:26.380304 *
**********************************************************************

+ set -o errexit
++ grep -v distribute_setup.py
++ find . -name build -prune -o -name '*.py'
+ pyfiles='./setup.py
./lplxcip/tests/utils.py
./lplxcip/tests/__init__.py
./lplxcip/tests/test_lxcip.py
./lplxcip/tests/test_helpers.py
./lplxcip/tests/test_utils.py
./lplxcip/lxcip.py
./lpsetup/utils.py
./lpsetup/__init__.py
./lpsetup/handlers.py
./lpsetup/tests/utils.py
./lpsetup/tests/__init__.py
./lpsetup/tests/test_argparser.py
./lpsetup/tests/test_cli.py
./lpsetup/tests/test_handlers.py
./lpsetup/tests/subcommands/__init__.py
./lpsetup/tests/subcommands/test_version.py
./lpsetup/tests/subcommands/test_initrepo.py
./lpsetup/tests/subcommands/test_init_target.py
./lpsetup/tests/subcommands/test_smoke.py
./lpsetup/tests/integration/common.py
./lpsetup/tests/integration/test_install_lxc.py
./lpsetup/tests/integration/test_init_target.py
./lpsetup/tests/test_utils.py
./lpsetup/subcommands/__init__.py
./lpsetup/subcommands/install_lxc.py
./lpsetup/subcommands/initlxc.py
./lpsetup/subcommands/init_target.py
./lpsetup/subcommands/update.py
./lpsetup/subcommands/initrepo.py
./lpsetup/subcommands/version.py
./lpsetup/exceptions.py
./lpsetup/argparser.py
./lpsetup/settings.py
./lpsetup/cli.py'
+ pocketlint ./setup.py ./lplxcip/tests/utils.py ./lplxcip/tests/__init__.py ./lplxcip/tests/test_lxcip.py ./lplxcip/tests/test_helpers.py ./lplxcip/tests/test_utils.py ./lplxcip/lxcip.py ./lpsetup/utils.py ./lpsetup/__init__.py ./lpsetup/handlers.py ./lpsetup/tests/utils.py ./lpsetup/tests/__init__.py ./lpsetup/tests/test_argparser.py ./lpsetup/tests/test_cli.py ./lpsetup/tests/test_handlers.py ./lpsetup/tests/subcommands/__init__.py ./lpsetup/tests/subcommands/test_version.py ...

=== renamed file 'lpsetup/bin/launchpad-database-setup' => 'lpsetup/bin/launchpad-database-setup.sh' (properties changed: +x to -x)
=== modified file 'lpsetup/subcommands/init_target.py'
--- lpsetup/subcommands/init_target.py	2012-08-24 18:49:30 +0000
+++ lpsetup/subcommands/init_target.py	2012-08-27 14:30:29 +0000
@@ -266,10 +266,16 @@
 def setup_database(user):
     """Setup Launchpad database."""
     with su(user):
-        script_name = 'launchpad-database-setup'
+        script_name = 'launchpad-database-setup.sh'
         here = os.path.dirname(__file__)
         script_path = os.path.join(here, '..', 'bin', script_name)
-        call('/bin/sh', script_path, user)
+        with open(script_path, 'r') as f:
+            line = f.readline()
+            interpreter = '/bin/sh'
+            assert line.startswith('#!' + interpreter), (
+                'Interpreter for {0} is not {1}.'.format(
+                    script_path, interpreter))
+        call(interpreter, script_path, user)
 
 setup_database.description = """Setup database for Launchpad use."""