[patch] Fix a few bugs

dispatch-conf.fixes (text/plain), 1.95 KB, created by Wayne Davison on 2003-09-07 18:22:12 UTC

--- ./archive-conf	2003-04-09 11:00:02.000000000 -0700
+++ /usr/lib/portage/bin/archive-conf	2003-09-07 17:02:09.000000000 -0700
@@ -87,10 +87,10 @@
         archive = os.path.join(options['archive-dir'], conf.lstrip('/'))
         if options['use-rcs'] == 'yes':
             dispatch_conf.rcs_archive(archive, conf, md5_match_hash[conf], '')
-            dispatch_conf.rcs_archive_post_process(archive):
+            dispatch_conf.rcs_archive_post_process(archive)
         else:
             dispatch_conf.file_archive(archive, conf, md5_match_hash[conf], '')
-            dispatch_conf.file_archive_post_process(archive):
+            dispatch_conf.file_archive_post_process(archive)
 
 # run
 if len(sys.argv) > 1:
--- ./dispatch-conf	2003-02-25 10:22:44.000000000 -0800
+++ /usr/lib/portage/bin/dispatch-conf	2003-09-07 17:58:05.000000000 -0700
@@ -23,7 +23,7 @@
 DIFF_WSCOMMENTS      = 'diff -Nau %s %s | grep "^[+-][^+-]" | grep -v "^[-+]#" | grep -v "^[-+][:space:]*$"'
 MERGE                = 'sdiff --suppress-common-lines --output=%s %s %s'
 
-LOG_CHANGES_TO = '/tmp/dispatch-conf.changes'
+LOG_CHANGES_TO = '/var/log/dispatch-conf.changes'
 
 MANDATORY_OPTS  = [ 'archive-dir', 'diff', 'pager', 'replace-cvs', 'replace-wscomments' ]
 
@@ -145,7 +145,7 @@
                 elif c == 'n':
                     break
                 elif c == 'm':
-                    merged = '/tmp/dispatch-conf.merged.%i' % (os.getpid (),)
+                    merged = re.sub(r'\._mrg', '._tmp', mrgconf)
                     print
                     os.system (MERGE % (merged, conf ['current'], newconf))
                     os.rename (merged, mrgconf)
@@ -161,6 +161,7 @@
                     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)