aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-16 23:40:33 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-16 23:40:48 +0100
commit4c1b9b7ad3d786c1c61c9cdfc25aa4845c3f089f (patch)
tree3b72030a2afcf8281c6d80dcbcba6fe60a588e9f
parent85d9b0e77cd4bcb7f3fbefaf7367c35ed8cb05e8 (diff)
downloadpaludis-4c1b9b7ad3d786c1c61c9cdfc25aa4845c3f089f.tar.gz
paludis-4c1b9b7ad3d786c1c61c9cdfc25aa4845c3f089f.tar.xz
Another mtime fix
-rw-r--r--paludis/merger.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/paludis/merger.cc b/paludis/merger.cc
index 475f56e..970fc02 100644
--- a/paludis/merger.cc
+++ b/paludis/merger.cc
@@ -887,11 +887,11 @@ Merger::track_renamed_dir_recursive(const FSEntry & dst)
case et_file:
{
- bool touch(_imp->merged_ids.end() == _imp->merged_ids.find(d->lowlevel_id()));
- _imp->merged_ids.insert(make_pair(d->lowlevel_id(), stringify(*d)));
- if (touch && ! FSEntry(*d).utime())
- throw MergerError("utime(" + stringify(*d) + ", 0) failed: " + stringify(::strerror(errno)));
- track_install_file(*d, dst, stringify(d->basename()), merged_how + msi_parent_rename);
+ bool touch(_imp->merged_ids.end() == _imp->merged_ids.find(d->lowlevel_id()));
+ _imp->merged_ids.insert(make_pair(d->lowlevel_id(), stringify(*d)));
+ if ((! _imp->params.options()[mo_preserve_mtimes]) && touch && ! FSEntry(*d).utime())
+ throw MergerError("utime(" + stringify(*d) + ", 0) failed: " + stringify(::strerror(errno)));
+ track_install_file(*d, dst, stringify(d->basename()), merged_how + msi_parent_rename);
}
continue;