diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-13 14:29:20 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-13 14:29:20 +0100 |
| commit | 784e35e86293094bb5c1456c8f9c844df2a71f12 (patch) | |
| tree | 28073f068ca09c46c04a5ed9e047824f782b15ac /ftparchive | |
| parent | a84a4d2ab78c498d9797c07d463daec4095b37de (diff) | |
| parent | 28b4b983d95fa742a5431547285a748e8b856399 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'ftparchive')
| -rw-r--r-- | ftparchive/multicompress.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index c1bd6037a..1555d2f2d 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -24,6 +24,7 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/time.h> #include <unistd.h> #include <iostream> @@ -237,7 +238,7 @@ bool MultiCompress::Finalize(unsigned long long &OutSize) if (UpdateMTime > 0 && (Now - St.st_mtime > (signed)UpdateMTime || St.st_mtime > Now)) { - utimensat(AT_FDCWD, I->Output.c_str(), NULL, AT_SYMLINK_NOFOLLOW); + utimes(I->Output.c_str(), NULL); Changed = true; } } |