1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 23:11:16 +02:00

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
This commit is contained in:
Eelco Dolstra 2019-06-21 12:49:18 +02:00
parent d0a769cb06
commit 29ccb2e969
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 7 additions and 10 deletions

View file

@ -135,7 +135,7 @@ GitInfo exportGit(ref<Store> store, 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) {