diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-06-21T10·49+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-06-24T20·16+0200 |
| commit | 64ec087f582cec33733f4102ab42a3e8f291758a (patch) | |
| tree | 75bbcdaa95056ef2421d82de75c0a411b2909c20 /src/libexpr/primops/fetchGit.cc | |
| parent | f8b30338ac231262bdf19844f044f0572c460048 (diff) | |
Fix 32-bit overflow with --no-net
--no-net causes tarballTtl to be set to the largest 32-bit integer, which causes comparison like 'time + tarballTtl < other_time' to fail on 32-bit systems. So cast them to 64-bit first. https://hydra.nixos.org/build/95076624 (cherry picked from commit 29ccb2e9697ee2184012dd13854e487928ae4441)
Diffstat (limited to 'src/libexpr/primops/fetchGit.cc')
| -rw-r--r-- | src/libexpr/primops/fetchGit.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc index cf7ccca418ed..3dcf3e9ff862 100644 --- a/src/libexpr/primops/fetchGit.cc +++ b/src/libexpr/primops/fetchGit.cc @@ -116,7 +116,7 @@ GitInfo exportGit(ref<Store> store, const std::string & uri, git fetch to update the local ref to the remote ref. */ struct stat st; doFetch = stat(localRefFile.c_str(), &st) != 0 || - st.st_mtime + settings.tarballTtl <= now; + (uint64_t) st.st_mtime + settings.tarballTtl <= (uint64_t) now; } if (doFetch) { |