From: Zac Medico Date: Fri, 16 Mar 2007 18:11:46 +0000 (-0000) Subject: For bug #171117, ensure that the new and old config have different timestamps (for... X-Git-Tag: v2.2_pre1~1582 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68222f834c6f872cc5b38462e2c399e8e3297123;p=portage.git For bug #171117, ensure that the new and old config have different timestamps (for the benefit of programs like rsync that need distiguishable timestamps to detect file changes). Thanks to Ben Bennett for reporting. svn path=/main/trunk/; revision=6215 --- diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index a4c7737d5..17ca0e390 100644 --- 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 = []