diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-06-18 20:01:32 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-06-18 20:01:32 +0000 |
| commit | 21efbdc097ff57b1991557c454d139ee7ce3a0a2 (patch) | |
| tree | da561f4b89385336fda180e4ce11c78594c892a3 /ports-mgmt/pkg | |
| parent | Fix a segfault on i386 and powerpc64 while registering a port as automatic [1] (diff) | |
Actually push the right patch
Notes
Notes:
svn path=/head/; revision=321219
Diffstat (limited to 'ports-mgmt/pkg')
| -rw-r--r-- | ports-mgmt/pkg/files/patch-fix-register-update | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ports-mgmt/pkg/files/patch-fix-register-update b/ports-mgmt/pkg/files/patch-fix-register-update index 80a99fb899e2..5a686fbdb163 100644 --- a/ports-mgmt/pkg/files/patch-fix-register-update +++ b/ports-mgmt/pkg/files/patch-fix-register-update @@ -1,16 +1,16 @@ diff --git libpkg/fetch.c libpkg/fetch.c -index c2e5919..8e902ae 100644 +index c2e5919..c094e33 100644 --- libpkg/fetch.c +++ libpkg/fetch.c -@@ -145,7 +145,7 @@ pkg_fetch_file_to_fd(const char *url, int dest, time_t t) - retry = max_retry; - - u = fetchParseURL(url); -- if (t != 0) -+ if (t != 0 && st.mtime != 0) - u->ims_time = t; - - doc = u->doc; +@@ -212,7 +212,7 @@ pkg_fetch_file_to_fd(const char *url, int dest, time_t t) + } + } + } +- if (t != 0) { ++ if (t != 0 && st.mtime != 0) { + if (st.mtime <= t) { + retcode = EPKG_UPTODATE; + goto cleanup; diff --git newvers.sh newvers.sh index 207aab0..651231f 100755 --- newvers.sh |