wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 00:11:17 +02:00
Code Activity

* Some more nesting.

Browse source
This commit is contained in:
Eelco Dolstra 2004-03-22 21:42:28 +00:00
parent 777e13b94b
commit 7823db2137
3 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/libutil/util.cc
View file

@ -144,11 +144,11 @@ Strings readDirectory(const Path & path)
}
void deletePath(const Path & path)
static void _deletePath(const Path & path)
{
checkInterrupt();
printMsg(lvlVomit, format("deleting path `%1%'") % path);
printMsg(lvlVomit, format("%1%") % path);
struct stat st;
if (lstat(path.c_str(), &st))
@ -164,7 +164,7 @@ void deletePath(const Path & path)
}
for (Strings::iterator i = names.begin(); i != names.end(); ++i)
deletePath(path + "/" + *i);
_deletePath(path + "/" + *i);
}
if (remove(path.c_str()) == -1)
@ -172,6 +172,14 @@ void deletePath(const Path & path)
}
void deletePath(const Path & path)
{
startNest(nest, lvlDebug,
format("recursively deleting path `%1%'") % path);
_deletePath(path);
}
void makePathReadOnly(const Path & path)
{
checkInterrupt();
@ -238,11 +246,7 @@ Nest::Nest()
Nest::~Nest()
{
if (nest) {
nestingLevel--;
if (logType == ltEscapes)
cerr << "\033[q";
}
close();
}
@ -259,14 +263,26 @@ void Nest::open(Verbosity level, const format & f)
{
if (level <= verbosity) {
if (logType == ltEscapes)
cerr << "\033[" << escVerbosity(level) << "p";
printMsg_(level, f);
cerr << "\033[" << escVerbosity(level) << "p"
<< f.str() << "\n";
else
printMsg_(level, f);
nest = true;
nestingLevel++;
}
}
void Nest::close()
{
if (nest) {
nestingLevel--;
if (logType == ltEscapes)
cerr << "\033[q";
}
}
void printMsg_(Verbosity level, const format & f)
{
checkInterrupt();