From 19de0f103854c1a62ee24badaf5ad3c9b69bb2d8 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <flamingcow@google.com>
Date: Tue, 29 Mar 2016 20:11:37 -0700
Subject: [PATCH] Move code into main()

---
 build_manifest.py | 13 +++++++++----
 fetcher.py        | 12 ++++++++----
 wrap_file.py      | 13 +++++++++----
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/build_manifest.py b/build_manifest.py
index 03cdbcd..d5da5a6 100755
--- a/build_manifest.py
+++ b/build_manifest.py
@@ -79,7 +79,12 @@ class ManifestBuilder(object):
     return ret
 
 
-builder = ManifestBuilder(FLAGS.image_dir, FLAGS.image_type, FLAGS.old_manifest)
-manifest = builder.BuildManifest()
-json.dump(manifest, sys.stdout, indent=4)
-sys.stdout.write('\n')
+def main():
+  builder = ManifestBuilder(FLAGS.image_dir, FLAGS.image_type, FLAGS.old_manifest)
+  manifest = builder.BuildManifest()
+  json.dump(manifest, sys.stdout, sort_keys=True, indent=4)
+  sys.stdout.write('\n')
+
+
+if __name__ == '__main__':
+  main()
diff --git a/fetcher.py b/fetcher.py
index 230b415..522e76a 100755
--- a/fetcher.py
+++ b/fetcher.py
@@ -86,7 +86,7 @@ class Fetcher(object):
   def _ChooseImage(self, manifest):
     hostname = socket.gethostname()
     hash_base = hashlib.sha256(hostname.encode('ascii'))
-    for image in manifest:
+    for image in manifest['images']:
       hashobj = hash_base.copy()
       hashobj.update(struct.pack('!L', image['timestamp']))
       my_bp = struct.unpack('!I', hashobj.digest()[-4:])[0] % self._MAX_BP
@@ -96,8 +96,12 @@ class Fetcher(object):
   def Fetch(self):
     manifest = self._GetManifest()
     image = self._ChooseImage(manifest)
-    print(image)
 
 
-fetcher = Fetcher(FLAGS.base_url, FLAGS.image_type, FLAGS.ca_cert)
-fetcher.Fetch()
+def main():
+  fetcher = Fetcher(FLAGS.base_url, FLAGS.image_type, FLAGS.ca_cert)
+  fetcher.Fetch()
+
+
+if __name__ == '__main__':
+  main()
diff --git a/wrap_file.py b/wrap_file.py
index 914cb0e..a29da1e 100755
--- a/wrap_file.py
+++ b/wrap_file.py
@@ -49,7 +49,12 @@ class Wrapper(object):
     }
 
 
-wrapper = Wrapper(FLAGS.key, FLAGS.cert, FLAGS.other_certs)
-wrapped = wrapper.Wrap(sys.stdin.read())
-json.dump(wrapped, sys.stdout, sort_keys=True, indent=4)
-sys.stdout.write('\n')
+def main():
+  wrapper = Wrapper(FLAGS.key, FLAGS.cert, FLAGS.other_certs)
+  wrapped = wrapper.Wrap(sys.stdin.read())
+  json.dump(wrapped, sys.stdout, sort_keys=True, indent=4)
+  sys.stdout.write('\n')
+
+
+if __name__ == '__main__':
+  main()