From 962532065c45b06753c91be38e8e1cb3894bd798 Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Wed, 19 Nov 2014 11:49:17 -0800
Subject: [PATCH] bootstrapvz/plugins/docker_daemon: flake8

---
 bootstrapvz/plugins/docker_daemon/pull.py  | 61 +++++++++-------------
 bootstrapvz/plugins/docker_daemon/tasks.py |  1 +
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/bootstrapvz/plugins/docker_daemon/pull.py b/bootstrapvz/plugins/docker_daemon/pull.py
index ed56169..8edd134 100644
--- a/bootstrapvz/plugins/docker_daemon/pull.py
+++ b/bootstrapvz/plugins/docker_daemon/pull.py
@@ -1,43 +1,32 @@
 import os
 import subprocess
 import time
-import logging
 
 
 def pull(info, images, retries=10):
-  if len(images) == 0:
-    return
+        if len(images) == 0:
+                return
 
-  bin_docker = os.path.join(info.root, 'usr/bin/docker')
-  graph_dir = os.path.join(info.root, 'var/lib/docker')
-  socket = 'unix://' + os.path.join(info.workspace, 'docker.sock')
-  pidfile = os.path.join(info.workspace, 'docker.pid')
-  try:
-    daemon = subprocess.Popen([bin_docker, '-d', '--graph', graph_dir, '-H', socket, '-p', pidfile])
-    for _ in range(retries):
-      if subprocess.call([bin_docker, '-H', socket, 'version']) == 0:
-        break
-      time.sleep(1)
-    for img in images:
-      if img.endswith('.tar.gz') or img.endswith('.tgz'):
-        cmd = [bin_docker, '-H', socket, 'load', '-i', img]
-        logging.debug(' '.join(cmd))
-        if subprocess.call(cmd) != 0:
-          msg = 'error loading docker image {img}.'.format(img=img)
-          raise Exception(msg)
-        continue
-      cmd = [bin_docker, '-H', socket, 'pull', img]
-      logging.debug('running: %s', ' '.join(cmd))
-      if subprocess.call(cmd) != 0:
-        msg = 'error pulling docker image {img}.'.format(img=img)
-        raise Exception(msg)
-  finally:
-    daemon.terminate()
-
-if __name__ == '__main__':
-  class Info(object):
-    root = '/tmp/bootstrap-vz/root'
-    workspace = '/tmp/bootstrap-vz/workspace'
-
-  pull_images = ['/usr/local/google/home/proppy/bootstrap-vz/busybox.tar.gz', 'golang:1.3']
-  pull(Info(), pull_images)
+        bin_docker = os.path.join(info.root, 'usr/bin/docker')
+        graph_dir = os.path.join(info.root, 'var/lib/docker')
+        socket = 'unix://' + os.path.join(info.workspace, 'docker.sock')
+        pidfile = os.path.join(info.workspace, 'docker.pid')
+        try:
+                daemon = subprocess.Popen([bin_docker, '-d', '--graph', graph_dir, '-H', socket, '-p', pidfile])
+                for _ in range(retries):
+                        if subprocess.call([bin_docker, '-H', socket, 'version']) == 0:
+                                break
+                        time.sleep(1)
+                for img in images:
+                        if img.endswith('.tar.gz') or img.endswith('.tgz'):
+                                cmd = [bin_docker, '-H', socket, 'load', '-i', img]
+                                if subprocess.call(cmd) != 0:
+                                        msg = 'error loading docker image {img}.'.format(img=img)
+                                        raise Exception(msg)
+                                continue
+                        cmd = [bin_docker, '-H', socket, 'pull', img]
+                        if subprocess.call(cmd) != 0:
+                                msg = 'error pulling docker image {img}.'.format(img=img)
+                                raise Exception(msg)
+        finally:
+                daemon.terminate()
diff --git a/bootstrapvz/plugins/docker_daemon/tasks.py b/bootstrapvz/plugins/docker_daemon/tasks.py
index c003880..75f8c10 100644
--- a/bootstrapvz/plugins/docker_daemon/tasks.py
+++ b/bootstrapvz/plugins/docker_daemon/tasks.py
@@ -67,6 +67,7 @@ class EnableMemoryCgroup(Task):
 		grub_config = os.path.join(info.root, 'etc/default/grub')
 		sed_i(grub_config, r'^(GRUB_CMDLINE_LINUX*=".*)"\s*$', r'\1 cgroup_enable=memory"')
 
+
 class PullDockerImages(Task):
 	description = 'Pull docker images'
 	phase = phases.system_modification