[rig3] r442 committed - Patch to report Img Gen Script errors as fatal. Not tested.

[ri...@googlecode.com]

Revision: 442
Author: ralfoide
Date: Wed Jul 7 19:31:43 2010
Log: Patch to report Img Gen Script errors as fatal. Not tested.
http://code.google.com/p/rig3/source/detail?r=442

Modified:
/trunk/rig3serv/src/rig/parser/izu_parser.py

=======================================
--- /trunk/rig3serv/src/rig/parser/izu_parser.py Sun Apr 4 23:37:44 2010
+++ /trunk/rig3serv/src/rig/parser/izu_parser.py Wed Jul 7 19:31:43 2010
@@ -859,6 +859,11 @@

def _ExternalGenRigUrl(self, rel_file, abs_dir, filename, title,
is_link, size, caption):
"""
+ Calls external script.
+ Returns None if there is no external script.
+ Returns False if script is dies with ret != 0, in which case we
just die painfully
+ anyway.
+ Otherwise returns the replacement string to use for the image.
"""
script = self._img_gen_script
if not script:
@@ -896,11 +901,12 @@
universal_newlines=True)

output = p.communicate()[0]
- if not output:
- return None
- ret = p.wait()
+ ret = -1
+ if output:
+ ret = p.wait()
if ret != 0:
- return None
+ self._log.Error("Image Gen Script failed. Ret=%d, Args=%s",
ret, repr(env))
+ sys.exit(2)

result = output
if output.find("<img ") == -1: