max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-23 14:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check earlier whether schema migration is required.

Browse source
This commit is contained in:
Ben Radford 2023-05-18 13:45:31 +01:00
parent fe174d72a2
commit d55e38b98a
No known key found for this signature in database
GPG key ID: 9DF5D4640AB888D5
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -284,6 +284,14 @@ LocalStore::LocalStore(const Params & params)
/* Check the current database schema and if necessary do an
upgrade. */
int curSchema = getSchema();
if (readOnly && curSchema < nixSchemaVersion) {
debug("current schema version: %d", curSchema);
debug("supported schema version: %d", nixSchemaVersion);
throw Error(curSchema == 0 ?
"database does not exist, and cannot be created in read-only mode" :
"database schema needs migrating, but this cannot be done in read-only mode");
}
if (curSchema > nixSchemaVersion)
throw Error("current Nix store schema is version %1%, but I only support %2%",
curSchema, nixSchemaVersion);
@ -307,7 +315,7 @@ LocalStore::LocalStore(const Params & params)
"which is no longer supported. To convert to the new format,\n"
"please upgrade Nix to version 1.11 first.");
if (!readOnly && !lockFile(globalLock.get(), ltWrite, false)) {
if (!lockFile(globalLock.get(), ltWrite, false)) {
printInfo("waiting for exclusive access to the Nix store...");
lockFile(globalLock.get(), ltNone, false); // We have acquired a shared lock; release it to prevent deadlocks
lockFile(globalLock.get(), ltWrite, true);
@ -342,8 +350,7 @@ LocalStore::LocalStore(const Params & params)
writeFile(schemaPath, fmt("%1%", nixSchemaVersion), 0666, true);
if (!readOnly)
lockFile(globalLock.get(), ltRead, true);
lockFile(globalLock.get(), ltRead, true);
}
else openDB(*state, false);