[paludis-commits] r4628 - in trunk: . paludis

[ciaranm at svn.pioto.org]

Author: ciaranm
Date: 2008-04-30 22:03:27 +0000 (Wed, 30 Apr 2008)
New Revision: 4628

Modified:
   trunk/ChangeLog
   trunk/paludis/merger.cc
Log:
Bug fix: if we install a directory via rename(), call utime() on all file children.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-30 21:33:53 UTC (rev 4627)
+++ trunk/ChangeLog	2008-04-30 22:03:27 UTC (rev 4628)
@@ -5,6 +5,11 @@
 only listed in SVN log. For a summary of what has changed between releases,
 see the NEWS file. This file is occasionally pruned to ChangeLog.old.bz2.
 
+2008-04-30 Ciaran McCreesh
+
+	* paludis/merger.cc: Bug fix: if we install a directory via rename(),
+	call utime() on all file children.
+
 2008-04-27 Bo Ørsted Andresen
 
 	* paludis/util/hashes.cc: Include string.

Modified: trunk/paludis/merger.cc
===================================================================
--- trunk/paludis/merger.cc	2008-04-30 21:33:53 UTC (rev 4627)
+++ trunk/paludis/merger.cc	2008-04-30 22:03:27 UTC (rev 4628)
@@ -840,6 +840,8 @@
                 continue;
 
             case et_file:
+                if (! FSEntry(*d).utime())
+                    throw MergerError("utime(" + stringify(*d) + ", 0) failed: " + stringify(::strerror(errno)));
                 record_install_file(*d, dst, stringify(d->basename()), MergeStatusFlags() + msi_parent_rename);
                 _imp->merged_ids.insert(make_pair(d->lowlevel_id(), stringify(*d)));
                 continue;