Update the dblink.isprotected() docstring.
authorZac Medico <zmedico@gentoo.org>
Sun, 26 Nov 2006 12:50:52 +0000 (12:50 -0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 26 Nov 2006 12:50:52 +0000 (12:50 -0000)
svn path=/main/trunk/; revision=5134

pym/portage.py

index 5d69701228b7b61b0f82a77cdd461c7e1034139f..7513beb2b0a5104a9374a95740fb6d2b918a12ee 100644 (file)
@@ -6427,10 +6427,9 @@ class dblink:
                return False
 
        def isprotected(self, filename):
-               """Files are protected by CONFIG_PROTECT only if they are not identical
-               to the file that was originally installed (otherwise, the unmerge phase
-               can remove them).  This allows the merge phase to replace files that
-               will eventually be unmerged anyway."""
+               """In cases where an installed package in the same slot owns a
+               protected file that will be merged, bump the mtime on the installed
+               file in order to ensure that it isn't unmerged."""
                if not self._config_protect.isprotected(filename):
                        return False
                if self._installed_instance is None: