Merge lp:~1chb1n/openstack-mojo-specs/fix-git-checkout-stable into lp:openstack-mojo-specs

[Ryan Beisner]

Update git_checkout_stable to initiate logger and show remotes and branches

The stable update script was attempting to log, but no logger was initiated. Automated runs of stable charm mojo specs showed no confirmation of the branch in use.

Update git_checkout_stable to initiate logger and show remotes and branches

Example output with these changes:
http://pastebin.ubuntu.com/15913007/

[lp:~1chb1n/openstack-mojo-specs/fix-git-checkout-stable]

257. By Ryan Beisner on 2016-04-17

Cleanup

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2310 mojo-openstack-specs for 1chb1n mp292078
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2310/

[lp:~1chb1n/openstack-mojo-specs/fix-git-checkout-stable]

258. By Ryan Beisner on 2016-04-17

Condense

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2311 mojo-openstack-specs for 1chb1n mp292078
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2311/

[Liam Young (gnuoy)]

LGTM

review: Approve

=== modified file 'helper/setup/git_checkout_stable.py'
--- helper/setup/git_checkout_stable.py	2016-04-12 08:43:49 +0000
+++ helper/setup/git_checkout_stable.py	2016-04-17 04:46:24 +0000
@@ -1,9 +1,12 @@
 #!/usr/bin/python
+import logging
 import sys
 import utils.mojo_utils as mojo_utils
 
 
 def main(argv):
+    log = logging.getLogger()
+    log.setLevel(logging.DEBUG)
     mojo_utils.git_checkout_all('stable')
 
 if __name__ == "__main__":

=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2016-04-12 08:50:09 +0000
+++ helper/utils/mojo_utils.py	2016-04-17 04:46:24 +0000
@@ -358,9 +358,15 @@
 
 
 def git_checkout_branch(charmdir, branch):
-    cmd = ['git', '-C', charmdir, 'checkout',  branch]
+    # Check out branch, show remotes and branches
     logging.info('Checking out {} in {}'.format(branch, charmdir))
-    subprocess.check_call(cmd)
+    cmds = [
+        ['git', '-C', charmdir, 'checkout', branch],
+        ['git', '-C', charmdir, 'remote', '-v'],
+        ['git', '-C', charmdir, 'branch', '-lv', '--no-abbrev'],
+    ]
+    for cmd in cmds:
+        subprocess.check_call(cmd)
 
 
 def git_checkout_all(branch):