Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 99418
Collapse All | Expand All

(-)/usr/lib/portage/bin/dispatch-conf (-1 / +4 lines)
Lines 193-199 Link Here
193
                elif c == 'm':
193
                elif c == 'm':
194
                    merged = SCRATCH_DIR+"/"+os.path.basename(conf['current'])
194
                    merged = SCRATCH_DIR+"/"+os.path.basename(conf['current'])
195
                    print
195
                    print
196
                    os.system (self.options['merge'] % (merged, conf ['current'], newconf))
196
                    ret = os.system (self.options['merge'] % (merged, conf ['current'], newconf))
197
                    if ret:
198
                        print "Failure running 'merge' command"
199
                        continue
197
                    shutil.copyfile(merged, mrgconf)
200
                    shutil.copyfile(merged, mrgconf)
198
                    os.remove(merged)
201
                    os.remove(merged)
199
                    mystat = os.lstat(conf['new'])
202
                    mystat = os.lstat(conf['new'])

Return to bug 99418