max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2025-02-16 15:17:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dropEmptyInitThenConcatStringsSep -> concatStringSep: sigs are non-empty

Browse source 
The sigs field is produced by tokenizeStrings, which does not return
empty strings.
This commit is contained in:
Robert Hensing 2024-07-13 00:11:14 +02:00
parent 3f37785afd
commit 75dde71ff9
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/local-store.cc
View file

@ -51,6 +51,8 @@
#include <sqlite3.h>
#include "strings.hh"
namespace nix {
@ -656,7 +658,7 @@ void LocalStore::registerDrvOutput(const Realisation & info)
combinedSignatures.insert(info.signatures.begin(),
info.signatures.end());
state->stmts->UpdateRealisedOutput.use()
(dropEmptyInitThenConcatStringsSep(" ", combinedSignatures))
(concatStringsSep(" ", combinedSignatures))
(info.id.strHash())
(info.id.outputName)
.exec();
@ -675,7 +677,7 @@ void LocalStore::registerDrvOutput(const Realisation & info)
(info.id.strHash())
(info.id.outputName)
(printStorePath(info.outPath))
(dropEmptyInitThenConcatStringsSep(" ", info.signatures))
(concatStringsSep(" ", info.signatures))
.exec();
}
for (auto & [outputId, depPath] : info.dependentRealisations) {
@ -729,7 +731,7 @@ uint64_t LocalStore::addValidPath(State & state,
(info.deriver ? printStorePath(*info.deriver) : "", (bool) info.deriver)
(info.narSize, info.narSize != 0)
(info.ultimate ? 1 : 0, info.ultimate)
(dropEmptyInitThenConcatStringsSep(" ", info.sigs), !info.sigs.empty())
(concatStringsSep(" ", info.sigs), !info.sigs.empty())
(renderContentAddress(info.ca), (bool) info.ca)
.exec();
uint64_t id = state.db.getLastInsertedRowId();
@ -833,7 +835,7 @@ void LocalStore::updatePathInfo(State & state, const ValidPathInfo & info)
(info.narSize, info.narSize != 0)
(info.narHash.to_string(HashFormat::Base16, true))
(info.ultimate ? 1 : 0, info.ultimate)
(dropEmptyInitThenConcatStringsSep(" ", info.sigs), !info.sigs.empty())
(concatStringsSep(" ", info.sigs), !info.sigs.empty())
(renderContentAddress(info.ca), (bool) info.ca)
(printStorePath(info.path))
.exec();

4
src/libstore/nar-info-disk-cache.cc
View file

@ -7,6 +7,8 @@
#include <sqlite3.h>
#include <nlohmann/json.hpp>
#include "strings.hh"
namespace nix {
static const char * schema = R"sql(
@ -339,7 +341,7 @@ public:
(info->narSize)
(dropEmptyInitThenConcatStringsSep(" ", info->shortRefs()))
(info->deriver ? std::string(info->deriver->to_string()) : "", (bool) info->deriver)
(dropEmptyInitThenConcatStringsSep(" ", info->sigs))
(concatStringsSep(" ", info->sigs))
(renderContentAddress(info->ca))
(time(0)).exec();