[patch] Catches error code of 'merge' command

dispatch-conf_failed_merge.patch (text/plain), 754 bytes, created by Jason Stubbs (RETIRED) on 2005-07-18 05:19:33 UTC

--- /usr/lib/portage/bin/dispatch-conf	2005-07-09 13:28:01.258426808 +0900
+++ dispatch-conf	2005-07-18 21:17:22.209904000 +0900
@@ -193,7 +193,10 @@
                 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'])