mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Print error messages, not debug messages.

Browse source
This commit is contained in:
Eelco Dolstra 2004-01-13 11:53:12 +00:00
parent 4c4fe7a114
commit 23fbc72f5d
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libstore/store.cc
View file

@ -400,7 +400,7 @@ void verifyStore()
for (Paths::iterator i = paths.begin(); i != paths.end(); ++i) { for (Paths::iterator i = paths.begin(); i != paths.end(); ++i) {
Path path = *i; Path path = *i;
if (!pathExists(path)) { if (!pathExists(path)) {
debug(format("path `%1%' disappeared") % path); printMsg(lvlError, format("path `%1%' disappeared") % path);
invalidatePath(path, txn); invalidatePath(path, txn);
} else } else
validPaths.insert(path); validPaths.insert(path);
@ -424,7 +424,8 @@ void verifyStore()
nixDB.queryStrings(txn, dbSubstitutes, *i, subPaths); nixDB.queryStrings(txn, dbSubstitutes, *i, subPaths);
for (Paths::iterator j = subPaths.begin(); j != subPaths.end(); ++j) for (Paths::iterator j = subPaths.begin(); j != subPaths.end(); ++j)
if (validPaths.find(*j) == validPaths.end()) if (validPaths.find(*j) == validPaths.end())
debug(format("found substitute mapping to non-existent path `%1%'") % *j); printMsg(lvlError,
format("found substitute mapping to non-existent path `%1%'") % *j);
else else
subPaths2.push_back(*j); subPaths2.push_back(*j);
if (subPaths.size() != subPaths2.size()) if (subPaths.size() != subPaths2.size())
@ -439,7 +440,8 @@ void verifyStore()
nixDB.enumTable(txn, dbSubstitutesRev, rsubs); nixDB.enumTable(txn, dbSubstitutesRev, rsubs);
for (Paths::iterator i = rsubs.begin(); i != rsubs.end(); ++i) { for (Paths::iterator i = rsubs.begin(); i != rsubs.end(); ++i) {
if (validPaths.find(*i) == validPaths.end()) { if (validPaths.find(*i) == validPaths.end()) {
debug(format("found reverse substitute mapping for non-existent path `%1%'") % *i); printMsg(lvlError,
format("found reverse substitute mapping for non-existent path `%1%'") % *i);
nixDB.delPair(txn, dbSubstitutesRev, *i); nixDB.delPair(txn, dbSubstitutesRev, *i);
} }
} }
@ -455,7 +457,8 @@ void verifyStore()
if (nixDB.queryString(txn, dbSuccessors, *i, sucPath) && if (nixDB.queryString(txn, dbSuccessors, *i, sucPath) &&
usablePaths.find(sucPath) == usablePaths.end()) usablePaths.find(sucPath) == usablePaths.end())
{ {
debug(format("found successor mapping to non-existent path `%1%'") % sucPath); printMsg(lvlError,
format("found successor mapping to non-existent path `%1%'") % sucPath);
nixDB.delPair(txn, dbSuccessors, *i); nixDB.delPair(txn, dbSuccessors, *i);
} }
} }
@ -466,7 +469,8 @@ void verifyStore()
nixDB.enumTable(txn, dbSuccessorsRev, rsucs); nixDB.enumTable(txn, dbSuccessorsRev, rsucs);
for (Paths::iterator i = rsucs.begin(); i != rsucs.end(); ++i) { for (Paths::iterator i = rsucs.begin(); i != rsucs.end(); ++i) {
if (usablePaths.find(*i) == usablePaths.end()) { if (usablePaths.find(*i) == usablePaths.end()) {
debug(format("found reverse successor mapping for non-existent path `%1%'") % *i); printMsg(lvlError,
format("found reverse successor mapping for non-existent path `%1%'") % *i);
nixDB.delPair(txn, dbSuccessorsRev, *i); nixDB.delPair(txn, dbSuccessorsRev, *i);
} }
} }