[patch] Patch against CVS dispatch-conf

dispatch-conf.diff (text/plain), 2.68 KB, created by Jason Stubbs (RETIRED) on 2004-10-26 06:54:25 UTC

--- ../gentoo-src/portage/bin/dispatch-conf	2004-10-04 23:16:31.923739256 +0900
+++ dispatch-conf	2004-10-26 22:53:44.279314808 +0900
@@ -19,9 +19,9 @@
 import portage, dispatch_conf
 
 FIND_EXTANT_CONFIGS  = "find %s -iname '._cfg????_*'"
-DIFF_CONTENTS        = 'diff -Nau %s %s'
-DIFF_CVS_INTERP      = 'diff -Nau %s %s | grep "^[+-][^+-]" | grep -v "# .Header:.*"'
-DIFF_WSCOMMENTS      = 'diff -Nau %s %s | grep "^[+-][^+-]" | grep -v "^[-+]#" | grep -v "^[-+][:space:]*$"'
+DIFF_CONTENTS        = 'diff -Nu %s %s'
+DIFF_CVS_INTERP      = 'diff -Nu %s %s | grep "^[+-][^+-]" | grep -v "# .Header:.*"'
+DIFF_WSCOMMENTS      = 'diff -Nu %s %s | grep "^[+-][^+-]" | grep -v "^[-+]#" | grep -v "^[-+][:space:]*$"'
 MERGE                = 'sdiff --suppress-common-lines --output=%s %s %s'
 
 LOG_CHANGES_TO = '/tmp/dispatch-conf.changes'
@@ -67,6 +67,13 @@
         #
 
         def f (conf):
+            # this function is being modified (and commented as such) to add
+            # support for "configuration file freezing" a feature that will
+            # allow users to specify copnfig files to never be overwritten
+            # <[e-mail]> (18 Sep 2004)
+            frozenfiles = []
+            if self.options.has_key('frozen'):
+                frozenfiles = self.options['frozen'].split()
             mrgconf = re.sub(r'\._cfg', '._mrg', conf['new'])
             archive = os.path.join(self.options['archive-dir'], conf['current'].lstrip('/'))
             if self.options['use-rcs'] == 'yes':
@@ -95,13 +102,19 @@
             same_wsc = same_wsc and self.options['replace-wscomments'] == 'yes'
             unmodified = unmodified and self.options['replace-unmodified'] == 'yes'
 
-            if same_file:
+            # just treat protected files as if they are a same file
+            # match, thereby removing the new file and leaving the current
+            # <[e-mail]> (18 Sep 2004)
+            if same_file or conf['current'] in frozenfiles or:
                 os.unlink (conf ['new'])
                 self.post_process(conf['current'])
                 if os.path.exists(mrgconf):
                     os.unlink(mrgconf)
                 return False
-            elif unmodified or same_cvs or same_wsc or conf ['dir'] in portage.settings ['CONFIG_PROTECT_MASK'].split ():
+
+            # added last or statment here for config file "clobbering"
+            # <[e-mail]> (18 Sep 2004)
+            elif unmodified or same_cvs or same_wsc or conf ['dir'] in portage.settings ['CONFIG_PROTECT_MASK'].split() or '-c' in sys.argv[1:]:
                 self.replace(newconf, conf['current'])
                 self.post_process(conf['current'])
                 if newconf == mrgconf: