For bug #171117, ensure that the new and old config have different timestamps (for...

svn path=/main/trunk/; revision=6215

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index a4c7737d557825c63383ddaef9e925d3a63d7fb4..17ca0e390e118c5970e66f5da5822b039e1ae997 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1494,8 +1494,14 @@ class dblink(object):
                else:
                        cfgfiledict["IGNORE"]=0
 
+               # Timestamp for files being merged.  Use time() - 1 in order to prevent
+               # a collision with timestamps that are bumped by the utime() call
+               # inside isprotected().  This ensures that the new and old config have
+               # different timestamps (for the benefit of programs like rsync that
+               # that need distiguishable timestamps to detect file changes).
+               mymtime = long(time.time() - 1)
+
                # set umask to 0 for merging; back up umask, save old one in prevmask (since this is a global change)
-               mymtime = long(time.time())
                prevmask = os.umask(0)
                secondhand = []