diff options
Diffstat (limited to 'rcynic')
| -rw-r--r-- | rcynic/rcynic-cron.py | 2 | ||||
| -rw-r--r-- | rcynic/rcynic-html.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/rcynic/rcynic-cron.py b/rcynic/rcynic-cron.py index 700d00d4..a2875401 100644 --- a/rcynic/rcynic-cron.py +++ b/rcynic/rcynic-cron.py @@ -62,7 +62,7 @@ def run(*cmd, **kwargs): try: subprocess.check_call(cmd, **kwargs) except subprocess.CalledProcessError, e: - sys.exit("Error %r running command: %s" % (e.strerror, " ".join(repr(c) for c in cmd))) + sys.exit(str(e)) try: lock = os.open(os.path.join(ac_rcynic_dir, "data/lock"), os.O_RDONLY | os.O_CREAT | os.O_NONBLOCK, 0666) diff --git a/rcynic/rcynic-html.py b/rcynic/rcynic-html.py index d86c84f3..46e2e634 100644 --- a/rcynic/rcynic-html.py +++ b/rcynic/rcynic-html.py @@ -323,6 +323,9 @@ class Host(Problem_Mixin): except OSError, e: usage("Problem running %s, perhaps you need to set --rrdtool-binary? (%s)" % ( opt["rrdtool-binary"], e)) + except subprocess.CalledProcessError, e: + sys.exit("Failure running %s: %s" % ( + opt["rrdtool-binary"], e)) def rrd_update(self): filename = os.path.join(opt["output_directory"], self.hostname) + ".rrd" |