From 5cd387135bf3a8fed2b6ce0ddc971dce338c1447 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 16 Mar 2007 18:12:21 +0000 Subject: 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. (trunk r6214:6215) svn path=/main/branches/2.1.2/; revision=6216 --- pym/portage.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index c977637ec..9661c72fe 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -7420,8 +7420,14 @@ class dblink: 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 = [] -- cgit v1.2.3-1-g7c22