qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Update strings from review comment

Browse source
This commit is contained in:
Matthew Bauer 2020-06-17 12:31:01 -04:00
parent 9ac0d98a59
commit 6438ba1e99
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/store-api.cc
View file

@ -670,7 +670,7 @@ void copyPaths(ref<Store> srcStore, ref<Store> dstStore, const StorePathSet & st
if (info->isContentAddressed(*srcStore)) { if (info->isContentAddressed(*srcStore)) {
storePathForDst = dstStore->makeFixedOutputPathFromCA(storePath.name(), info->ca); storePathForDst = dstStore->makeFixedOutputPathFromCA(storePath.name(), info->ca);
if (storePathForDst != storePath) if (storePathForDst != storePath)
debug("rewriting path '%s' to '%s' for substituter '%s'", srcStore->printStorePath(storePath), dstStore->printStorePath(storePathForDst), dstStore->getUri()); debug("replaced path '%s' to '%s' for substituter '%s'", srcStore->printStorePath(storePath), dstStore->printStorePath(storePathForDst), dstStore->getUri());
} }
if (dstStore->isValidPath(storePathForDst)) { if (dstStore->isValidPath(storePathForDst)) {
@ -695,7 +695,7 @@ void copyPaths(ref<Store> srcStore, ref<Store> dstStore, const StorePathSet & st
if (info->isContentAddressed(*srcStore)) { if (info->isContentAddressed(*srcStore)) {
storePathForDst = dstStore->makeFixedOutputPathFromCA(storePath.name(), info->ca); storePathForDst = dstStore->makeFixedOutputPathFromCA(storePath.name(), info->ca);
if (storePathForDst != storePath) if (storePathForDst != storePath)
debug("rewriting path '%s' to '%s' for substituter '%s'", srcStore->printStorePath(storePath), dstStore->printStorePath(storePathForDst), dstStore->getUri()); debug("replaced path '%s' to '%s' for substituter '%s'", srcStore->printStorePath(storePath), dstStore->printStorePath(storePathForDst), dstStore->getUri());
} }
if (!dstStore->isValidPath(storePathForDst)) { if (!dstStore->isValidPath(storePathForDst)) {

2
src/nix/add-to-store.cc
View file

@ -26,7 +26,7 @@ struct CmdAddToStore : MixDryRun, StoreCommand
addFlag({ addFlag({
.longName = "flat", .longName = "flat",
.shortName = 0, .shortName = 0,
.description = "use flat file ingestion", .description = "add flat file to the Nix store",
.handler = {&ingestionMethod, FileIngestionMethod::Flat}, .handler = {&ingestionMethod, FileIngestionMethod::Flat},
}); });
} }