Move code into main()

build_manifest.py

@@ -79,7 +79,12 @@ class ManifestBuilder(object):
     return ret
 
 
-builder = ManifestBuilder(FLAGS.image_dir, FLAGS.image_type, FLAGS.old_manifest)
+def main():
-manifest = builder.BuildManifest()
+  builder = ManifestBuilder(FLAGS.image_dir, FLAGS.image_type, FLAGS.old_manifest)
-json.dump(manifest, sys.stdout, indent=4)
+  manifest = builder.BuildManifest()
-sys.stdout.write('\n')
+  json.dump(manifest, sys.stdout, sort_keys=True, indent=4)
+  sys.stdout.write('\n')
+
+
+if __name__ == '__main__':
+  main()

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)
+def main():
-fetcher.Fetch()
+  fetcher = Fetcher(FLAGS.base_url, FLAGS.image_type, FLAGS.ca_cert)
+  fetcher.Fetch()
+
+
+if __name__ == '__main__':
+  main()

wrap_file.py

@@ -49,7 +49,12 @@ class Wrapper(object):
     }
 
 
-wrapper = Wrapper(FLAGS.key, FLAGS.cert, FLAGS.other_certs)
+def main():
-wrapped = wrapper.Wrap(sys.stdin.read())
+  wrapper = Wrapper(FLAGS.key, FLAGS.cert, FLAGS.other_certs)
-json.dump(wrapped, sys.stdout, sort_keys=True, indent=4)
+  wrapped = wrapper.Wrap(sys.stdin.read())
-sys.stdout.write('\n')
+  json.dump(wrapped, sys.stdout, sort_keys=True, indent=4)
+  sys.stdout.write('\n')
+
+
+if __name__ == '__main__':
+  main()