[ARVADOS] updated: 2917d8c1e42d2c4569f131778febb18db7445ac4

[git at public.curoverse.com]

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

       via  2917d8c1e42d2c4569f131778febb18db7445ac4 (commit)
      from  5dbf5c8ea2d9eb2bc8e10a03ca625f12ed71f12c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2917d8c1e42d2c4569f131778febb18db7445ac4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Feb 12 13:52:28 2015 -0500

    4904: Remove extraneous ciddir and cidfilepath.  Explicit non-zero exit code
    when an ArgumentError is caught.

diff --git a/services/arv-web/arv-web.py b/services/arv-web/arv-web.py
index 7dbd304..e731558 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:]))

-----------------------------------------------------------------------


hooks/post-receive
--