Attachment #17243 for bug #14079

Lines 87-96 Link Here

(-)./archive-conf (-2 / +2 lines)
87	archive = os.path.join(options['archive-dir'], conf.lstrip('/'))	87	archive = os.path.join(options['archive-dir'], conf.lstrip('/'))
88	if options['use-rcs'] == 'yes':	88	if options['use-rcs'] == 'yes':
89	dispatch_conf.rcs_archive(archive, conf, md5_match_hash[conf], '')	89	dispatch_conf.rcs_archive(archive, conf, md5_match_hash[conf], '')
90	dispatch_conf.rcs_archive_post_process(archive):	90	dispatch_conf.rcs_archive_post_process(archive)
91	else:	91	else:
92	dispatch_conf.file_archive(archive, conf, md5_match_hash[conf], '')	92	dispatch_conf.file_archive(archive, conf, md5_match_hash[conf], '')
93	dispatch_conf.file_archive_post_process(archive):	93	dispatch_conf.file_archive_post_process(archive)
94		94
95	# run	95	# run
96	if len(sys.argv) > 1:	96	if len(sys.argv) > 1:




DIFF_WSCOMMENTS      = 'diff -Nau %s %s | grep "^[+-][^+-]" | grep -v "^[-+]#" | grep -v "^[-+][:space:]*$"'
MERGE                = 'sdiff --suppress-common-lines --output=%s %s %s'

LOG_CHANGES_TO = '/var/log/dispatch-conf.changes'

MANDATORY_OPTS  = [ 'archive-dir', 'diff', 'pager', 'replace-cvs', 'replace-wscomments' ]


                elif c == 'n':
                    break
                elif c == 'm':
                    merged = re.sub(r'\._mrg', '._tmp', mrgconf)
                    print
                    os.system (MERGE % (merged, conf ['current'], newconf))
                    os.rename (merged, mrgconf)

                    os.system(os.environ['EDITOR'] + ' ' + newconf)
                    continue
                elif c == 'z':
                    self.post_process(conf['current'])
                    os.unlink(conf['new'])
                    if os.path.exists(mrgconf):
                        os.unlink(mrgconf)

Return to bug 14079

Lines 23-29 Link Here

(-)./dispatch-conf (-2 / +3 lines)
23	DIFF_WSCOMMENTS = 'diff -Nau %s %s \| grep "^[+-][^+-]" \| grep -v "^[-+]#" \| grep -v "^[-+][:space:]*$"'	23	DIFF_WSCOMMENTS = 'diff -Nau %s %s \| grep "^[+-][^+-]" \| grep -v "^[-+]#" \| grep -v "^[-+][:space:]*$"'
24	MERGE = 'sdiff --suppress-common-lines --output=%s %s %s'	24	MERGE = 'sdiff --suppress-common-lines --output=%s %s %s'
25		25
26	LOG_CHANGES_TO = '/tmp/dispatch-conf.changes'	26	LOG_CHANGES_TO = '/var/log/dispatch-conf.changes'
27		27
28	MANDATORY_OPTS = [ 'archive-dir', 'diff', 'pager', 'replace-cvs', 'replace-wscomments' ]	28	MANDATORY_OPTS = [ 'archive-dir', 'diff', 'pager', 'replace-cvs', 'replace-wscomments' ]
29		29
Lines 145-151 Link Here
145	elif c == 'n':	145	elif c == 'n':
146	break	146	break
147	elif c == 'm':	147	elif c == 'm':
148	merged = '/tmp/dispatch-conf.merged.%i' % (os.getpid (),)	148	merged = re.sub(r'\._mrg', '._tmp', mrgconf)
149	print	149	print
150	os.system (MERGE % (merged, conf ['current'], newconf))	150	os.system (MERGE % (merged, conf ['current'], newconf))
151	os.rename (merged, mrgconf)	151	os.rename (merged, mrgconf)
Lines 161-166 Link Here
161	os.system(os.environ['EDITOR'] + ' ' + newconf)	161	os.system(os.environ['EDITOR'] + ' ' + newconf)
162	continue	162	continue
163	elif c == 'z':	163	elif c == 'z':
		164	self.post_process(conf['current'])
164	os.unlink(conf['new'])	165	os.unlink(conf['new'])
165	if os.path.exists(mrgconf):	166	if os.path.exists(mrgconf):
166	os.unlink(mrgconf)	167	os.unlink(mrgconf)