From 23fbc72f5d65725dd1804efe695aaa84580a8637 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 13 Jan 2004 11:53:12 +0000 Subject: [PATCH] * Print error messages, not debug messages. --- src/libstore/store.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/libstore/store.cc b/src/libstore/store.cc index 20625b9fe8..c1d95ab8c5 100644 --- a/src/libstore/store.cc +++ b/src/libstore/store.cc @@ -400,7 +400,7 @@ void verifyStore() for (Paths::iterator i = paths.begin(); i != paths.end(); ++i) { Path path = *i; if (!pathExists(path)) { - debug(format("path `%1%' disappeared") % path); + printMsg(lvlError, format("path `%1%' disappeared") % path); invalidatePath(path, txn); } else validPaths.insert(path); @@ -424,7 +424,8 @@ void verifyStore() nixDB.queryStrings(txn, dbSubstitutes, *i, subPaths); for (Paths::iterator j = subPaths.begin(); j != subPaths.end(); ++j) 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 subPaths2.push_back(*j); if (subPaths.size() != subPaths2.size()) @@ -439,7 +440,8 @@ void verifyStore() nixDB.enumTable(txn, dbSubstitutesRev, rsubs); for (Paths::iterator i = rsubs.begin(); i != rsubs.end(); ++i) { 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); } } @@ -455,7 +457,8 @@ void verifyStore() if (nixDB.queryString(txn, dbSuccessors, *i, sucPath) && 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); } } @@ -466,7 +469,8 @@ void verifyStore() nixDB.enumTable(txn, dbSuccessorsRev, rsucs); for (Paths::iterator i = rsucs.begin(); i != rsucs.end(); ++i) { 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); } }