[gentoo-portage-dev] [PATCH] dblink._protect: disable config protect for identical files (531854)

[Zac Medico]

Since commit 02417188225758b1822d176abd8902a92300a371, config
protection was triggered for identical files if
config-protect-if-modified was not enabled in FEATURES. Fix it
to skip config protection in this case.

Fixes: 024171882257 ("CONFIG_PROTECT: protect symlinks, bug #485598")
X-Gentoo-Bug: 531854
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=531854
---
 pym/portage/dbapi/vartree.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index df031cd..4840492 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -4856,8 +4856,10 @@ class dblink(object):
 
 		if protected and dest_mode is not None:
 			# we have a protection path; enable config file management.
-			if src_md5 != dest_md5 and \
-				src_md5 == cfgfiledict.get(dest_real, [None])[0]:
+			if src_md5 == dest_md5:
+				protected = False
+
+			elif src_md5 == cfgfiledict.get(dest_real, [None])[0]:
 				# An identical update has previously been
 				# merged.  Skip it unless the user has chosen
 				# --noconfmem.
-- 
2.0.4