Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 305393 | Differences between
and this patch

Collapse All | Expand All

(-)bin/dispatch-conf (+3 lines)
Lines 267-272 Link Here
267 
                    merged = SCRATCH_DIR+"/"+os.path.basename(conf['current'])
 267 
                    merged = SCRATCH_DIR+"/"+os.path.basename(conf['current'])
268 
                    print()
 268 
                    print()
269 
                    ret = os.system (self.options['merge'] % (merged, conf ['current'], newconf))
 269 
                    ret = os.system (self.options['merge'] % (merged, conf ['current'], newconf))
270 
                    ret = os.WEXITSTATUS(ret)
271 
                    if ret < 2:
272 
                        ret = 0
270 
                    if ret:
 273 
                    if ret:
271 
                        print("Failure running 'merge' command")
 274 
                        print("Failure running 'merge' command")
272 
                        continue
 275 
                        continue

Return to bug 305393