[gentoo-portage-dev] PATCH: [dispatch-conf] Don't use result when config merging fails (#99418)

[gentoo-portage-dev] PATCH: [dispatch-conf] Don't use result when config merging fails (#99418)

[Jason Stubbs]

[-- Attachment #1.1: Type: text/plain, Size: 297 bytes --]

http://bugs.gentoo.org/show_bug.cgi?id=98727

Author: Jason Stubbs

If an interactive merge fails for any reason, dispatch-conf will use
the file created anyway. This patch causes the resulting file to
be ignored if the interactive merge program does not exit cleanly.

-- 
Jason Stubbs

[-- Attachment #1.2: 99418_merge_retcode_ignored.patch --]
[-- Type: text/x-diff, Size: 743 bytes --]

--- /usr/sbin/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'])

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]