[patch] frozen files

dispatch-conf.patch (text/plain), 1.62 KB, created by Bo Ørsted Andresen (RETIRED) on 2006-10-29 13:17:01 UTC

diff -ur portage-2.1.2_rc1/bin/dispatch-conf portage-2.1.2_rc1-new/bin/dispatch-conf
--- portage-2.1.2_rc1/bin/dispatch-conf	2006-10-26 23:35:46.000000000 +0200
+++ portage-2.1.2_rc1-new/bin/dispatch-conf	2006-10-29 22:15:33.000000000 +0100
@@ -101,6 +101,12 @@
                     return False
 
 
+        # config file freezing support
+        frozenfiles = []
+        if self.options.has_key('frozen'):
+            frozenfiles = self.options['frozen'].split()
+
+
         #
         # Remove new configs identical to current
         #                  and
@@ -144,6 +150,12 @@
                 if os.path.exists(mrgconf):
                     os.unlink(mrgconf)
                 return False
+            elif conf['current'] in frozenfiles:
+                print '%s is frozen' % ( conf['current'])
+                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 ():
                 self.replace(newconf, conf['current'])
                 self.post_process(conf['current'])
diff -ur portage-2.1.2_rc1/cnf/dispatch-conf.conf portage-2.1.2_rc1-new/cnf/dispatch-conf.conf
--- portage-2.1.2_rc1/cnf/dispatch-conf.conf	2006-10-26 23:35:45.000000000 +0200
+++ portage-2.1.2_rc1-new/cnf/dispatch-conf.conf	2006-10-29 21:43:55.000000000 +0100
@@ -34,3 +34,6 @@
 
 # Per-session log file of changes made to configuration files
 #log-file=/var/log/dispatch-conf.log
+
+# List of files that dispatch-conf will never touch
+frozen = ""