Merge lp:~danilo/linaro-license-protection/python26-compat into lp:~linaro-automation/linaro-license-protection/trunk

[Данило Шеган]

python2.6 compat for lucid.

subprocess module has no call_output() and a few other small tidbits.

[James Tunnicliffe (dooferlad)]

What, no tests for the deploy script changes?

:p

review: Approve

[Данило Шеган (danilo)]

Shush. :)

=== modified file 'scripts/linaroscript.py'
--- scripts/linaroscript.py	2012-08-22 22:27:28 +0000
+++ scripts/linaroscript.py	2012-08-23 17:19:22 +0000
@@ -55,8 +55,10 @@
         if verbosity == 0:
             logging_level = logging.ERROR
         elif verbosity == 1:
+            logging_level = logging.WARNING
+        elif verbosity == 2:
             logging_level = logging.INFO
-        elif verbosity >= 2:
+        elif verbosity >= 3:
             logging_level = logging.DEBUG
         else:
             logging_level = logging.ERROR
 
=== modified file 'scripts/update-deployment.py'
--- scripts/update-deployment.py	2012-08-22 22:27:28 +0000
+++ scripts/update-deployment.py	2012-08-23 17:19:22 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 
 """Update a deployment of lp:linaro-license-protection.
 
@@ -84,6 +84,20 @@
         code_tree = bzrlib.workingtree.WorkingTree.open(working_tree_dir)
         code_tree.update()
 
+    def run_subcommand(self, arguments, cwd=None):
+        process = subprocess.Popen(arguments, cwd=cwd, stdout=subprocess.PIPE,
+                                   stderr=subprocess.PIPE)
+        process_out, process_err = process.communicate()
+        if process_out is not None:
+            self.logger.debug(
+                "stdout:\n" + "\n\t".join(process_out.splitlines()))
+        if process_err is not None:
+            self.logger.debug(
+                "stderr:\n" + "\n\t".join(process_err.splitlines()))
+        if process.returncode != 0:
+            self.logger.error(
+                "FAILED %d", process.returncode)
+
     def update_installation(self, config, installation_root):
         """Updates a single installation code and databases.
 
@@ -108,13 +122,13 @@
                           os.environ.get("DJANGO_SETTINGS_MODULE"))
 
         self.logger.debug("Doing 'syncdb'...")
-        self.logger.debug(subprocess.check_output(
-                ["django-admin", "syncdb", "--noinput"], cwd=code_root))
+        self.run_subcommand(
+                ["django-admin", "syncdb", "--noinput"], cwd=code_root)
 
         self.logger.debug("Doing 'collectstatic'...")
-        self.logger.debug(subprocess.check_output(
+        self.run_subcommand(
                 ["django-admin", "collectstatic", "--noinput"],
-                cwd=code_root))
+                cwd=code_root)
 
     def setup_parser(self):
         super(UpdateDeploymentScript, self).setup_parser()