Merge lp:~danilo/linaro-license-protection/fix-deployment-script into lp:~linaro-automation/linaro-license-protection/trunk

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

Now that we have cronjob running the update-deployment script every half
an hour, it was easy to see that the working tree checkouts were not
being updated because they are not branches themselves (i.e. their branch
is up to date, but checkouts are working trees).

We were also always defaulting to a DEBUG error level which meant that
the script was never quiet (even without the -v options).

[Stevan Radaković (stevanr)]

Looks good.
Approve +1.

review: Approve (code)

=== modified file 'scripts/update-deployment.py'
--- scripts/update-deployment.py	2012-08-13 11:43:07 +0000
+++ scripts/update-deployment.py	2012-08-16 10:25:42 +0000
@@ -36,6 +36,7 @@
 
 import argparse
 import bzrlib.branch
+import bzrlib.workingtree
 import logging
 import os
 import subprocess
@@ -55,8 +56,6 @@
     "settings_staging_snapshots": staging_snapshots_root,
     }
 
-logging_level = logging.DEBUG
-
 code_root = os.path.join(code_base, branch_name)
 configs_root = os.path.join(code_base, configs_branch_name)
 
@@ -76,22 +75,22 @@
     return code_branch
 
 
-def update_branch(branch_dir):
+def update_tree(working_tree_dir):
     """Does a checkout update."""
-    code_branch = bzrlib.branch.Branch.open(branch_dir)
-    code_branch.update()
+    code_tree = bzrlib.workingtree.WorkingTree.open(working_tree_dir)
+    code_tree.update()
 
 
 def update_installation(config, installation_root):
     """Updates a single installation code and databases.
 
-    It expects code and config branches to be simple checkouts so it only
-    does an "update" on them.
+    It expects code and config branches to be simple checkouts (working trees)
+    so it only does an "update" on them.
 
     Afterwards, it runs "syncdb" and "collectstatic" steps.
     """
-    update_branch(os.path.join(installation_root, branch_name))
-    update_branch(os.path.join(installation_root, "configs"))
+    update_tree(os.path.join(installation_root, branch_name))
+    update_tree(os.path.join(installation_root, "configs"))
     os.environ["PYTHONPATH"] = (
         ":".join(
             [installation_root,
@@ -128,6 +127,7 @@
                               "Can be used multiple times"))
     args = parser.parse_args()
 
+    logging_level = logging.ERROR
     if args.verbose == 0:
         logging_level = logging.ERROR
     elif args.verbose == 1: