From 2917d8c1e42d2c4569f131778febb18db7445ac4 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Thu, 12 Feb 2015 13:52:28 -0500
Subject: [PATCH] 4904: Remove extraneous ciddir and cidfilepath.  Explicit
 non-zero exit code when an ArgumentError is caught.

---
 services/arv-web/arv-web.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/services/arv-web/arv-web.py b/services/arv-web/arv-web.py
index 7dbd304adc..e7315585a0 100755
--- a/services/arv-web/arv-web.py
+++ b/services/arv-web/arv-web.py
@@ -156,8 +156,6 @@ class ArvWeb(object):
             self.stop_docker()
 
             logger.info("Starting Docker container %s", docker_image)
-            ciddir = tempfile.mkdtemp()
-            cidfilepath = os.path.join(ciddir, "cidfile")
             self.cid = subprocess.check_output(["docker", "run",
                                                 "--detach=true",
                                                 "--publish=%i:80" % (self.port),
@@ -246,6 +244,9 @@ def main(argv):
         arvweb.run()
     except arvados.errors.ArgumentError as e:
         logger.error(e)
+        return 1
+
+    return 0
 
 if __name__ == '__main__':
-    main(sys.argv[1:])
+    sys.exit(main(sys.argv[1:]))
-- 
2.30.2