diff options
Diffstat (limited to 'bin/dispatch-conf')
| -rwxr-xr-x | bin/dispatch-conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 0d316126a..5007353fc 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -186,7 +186,10 @@ class dispatch: elif c == 'm': merged = SCRATCH_DIR+"/"+os.path.basename(conf['current']) print - os.system (self.options['merge'] % (merged, conf ['current'], newconf)) + ret = os.system (self.options['merge'] % (merged, conf ['current'], newconf)) + if ret: + print "Failure running 'merge' command" + continue shutil.copyfile(merged, mrgconf) os.remove(merged) mystat = os.lstat(conf['new']) |