maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix/libexpr): Replace logging.h with glog

Browse source
This commit is contained in:
Vincent Ambo 2020-05-19 01:24:50 +01:00
parent d0c44425e1
commit 939dd9f817
8 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

19
third_party/nix/src/libexpr/parser.y vendored
View file

@ -17,9 +17,9 @@
#define BISON_HEADER
#include "util.hh"
#include "nixexpr.hh"
#include "eval.hh"
#include <glog/logging.h>
namespace nix {
@ -681,24 +681,23 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
request.unpack = true;
res = { true, getDownloader()->downloadCached(store, request).path };
} catch (DownloadError & e) {
printError(format("warning: Nix search path entry '%1%' cannot be downloaded, ignoring") % elem.second);
res = { false, "" };
LOG(WARNING) << "Nix search path entry '" << elem.second << "' cannot be downloaded, ignoring";
res = { false, "" };
}
} else {
auto path = absPath(elem.second);
if (pathExists(path))
if (pathExists(path)) {
res = { true, path };
else {
printError(format("warning: Nix search path entry '%1%' does not exist, ignoring") % elem.second);
res = { false, "" };
} else {
LOG(WARNING) << "Nix search path entry '" << elem.second << "' does not exist, ignoring";
res = { false, "" };
}
}
debug(format("resolved search path element '%s' to '%s'") % elem.second % res.second);
DLOG(INFO) << "resolved search path element '" << elem.second << "' to '" << res.second << "'";
searchPathResolved[elem.second] = res;
return res;
}
}
} // namespace nix