diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-28 16:43:49 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-28 16:43:49 +0100 |
| commit | acead5b93cf49ab33cba4be2ea8e1b253ed0f2bf (patch) | |
| tree | 7c8631716d2182c7891533a0e4ce3b6962595f17 /ftparchive/multicompress.cc | |
| parent | f4a631adf2f14c99d61ecb7f61cb1b3625c1cde4 (diff) | |
| parent | bae81c1307e956aa8928c9d6a77830fb733cd61f (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'ftparchive/multicompress.cc')
| -rw-r--r-- | ftparchive/multicompress.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 1fea589e2..265fb1a80 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -21,9 +21,9 @@ #include <apt-pkg/error.h> #include <apt-pkg/md5.h> +#include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> -#include <utime.h> #include <unistd.h> #include <iostream> @@ -234,14 +234,12 @@ bool MultiCompress::Finalize(unsigned long long &OutSize) else { // Update the mtime if necessary - if (UpdateMTime > 0 && + if (UpdateMTime > 0 && (Now - St.st_mtime > (signed)UpdateMTime || St.st_mtime > Now)) { - struct utimbuf Buf; - Buf.actime = Buf.modtime = Now; - utime(I->Output.c_str(),&Buf); + utimensat(AT_FDCWD, I->Output.c_str(), NULL, AT_SYMLINK_NOFOLLOW); Changed = true; - } + } } // Force the file permissions |