ENH: add rmDir silent option for all fileOperations implementations
This commit is contained in:
parent
ba39777818
commit
9edc0c15fe
@ -404,7 +404,11 @@ int main(int argc, char *argv[])
|
||||
Info<< "Removing " << nProcs
|
||||
<< " existing processor directories" << endl;
|
||||
|
||||
fileHandler().rmDir(runTime.path()/word("processors"));
|
||||
fileHandler().rmDir
|
||||
(
|
||||
runTime.path()/word("processors"),
|
||||
true // silent (may not have been collated)
|
||||
);
|
||||
|
||||
// remove existing processor dirs
|
||||
// reverse order to avoid gaps if someone interrupts the process
|
||||
|
@ -247,7 +247,12 @@ public:
|
||||
virtual bool rm(const fileName&) const = 0;
|
||||
|
||||
//- Remove a dirctory and its contents
|
||||
virtual bool rmDir(const fileName&) const = 0;
|
||||
// \param silent do not report missing directory
|
||||
virtual bool rmDir
|
||||
(
|
||||
const fileName& dir,
|
||||
const bool silent = false
|
||||
) const = 0;
|
||||
|
||||
// //- Open a shared library. Return handle to library. Print error
|
||||
// // message if library cannot be loaded (check = true)
|
||||
|
@ -630,10 +630,11 @@ bool Foam::fileOperations::masterUncollatedFileOperation::rm
|
||||
|
||||
bool Foam::fileOperations::masterUncollatedFileOperation::rmDir
|
||||
(
|
||||
const fileName& dir
|
||||
const fileName& dir,
|
||||
const bool silent
|
||||
) const
|
||||
{
|
||||
return masterOp<bool, rmDirOp>(dir, rmDirOp());
|
||||
return masterOp<bool, rmDirOp>(dir, rmDirOp(silent));
|
||||
}
|
||||
|
||||
|
||||
|
@ -249,10 +249,19 @@ protected:
|
||||
|
||||
class rmDirOp
|
||||
{
|
||||
bool silent_;
|
||||
public:
|
||||
rmDirOp()
|
||||
:
|
||||
silent_(false)
|
||||
{}
|
||||
rmDirOp(const bool silent)
|
||||
:
|
||||
silent_(silent)
|
||||
{}
|
||||
bool operator()(const fileName& fName) const
|
||||
{
|
||||
return Foam::rmDir(fName);
|
||||
return Foam::rmDir(fName, silent_);
|
||||
}
|
||||
};
|
||||
|
||||
@ -533,7 +542,12 @@ public:
|
||||
virtual bool rm(const fileName&) const;
|
||||
|
||||
//- Remove a dirctory and its contents
|
||||
virtual bool rmDir(const fileName&) const;
|
||||
// \param silent do not report missing directory
|
||||
virtual bool rmDir
|
||||
(
|
||||
const fileName& dir,
|
||||
const bool silent = false
|
||||
) const;
|
||||
|
||||
// //- Open a shared library. Return handle to library. Print error
|
||||
// // message if library cannot be loaded (check = true)
|
||||
|
@ -292,10 +292,11 @@ bool Foam::fileOperations::uncollatedFileOperation::rm
|
||||
|
||||
bool Foam::fileOperations::uncollatedFileOperation::rmDir
|
||||
(
|
||||
const fileName& dir
|
||||
const fileName& dir,
|
||||
const bool silent
|
||||
) const
|
||||
{
|
||||
return Foam::rmDir(dir);
|
||||
return Foam::rmDir(dir, silent);
|
||||
}
|
||||
|
||||
|
||||
|
@ -192,7 +192,11 @@ public:
|
||||
virtual bool rm(const fileName&) const;
|
||||
|
||||
//- Remove a dirctory and its contents
|
||||
virtual bool rmDir(const fileName&) const;
|
||||
virtual bool rmDir
|
||||
(
|
||||
const fileName& dir,
|
||||
const bool silent = false
|
||||
) const;
|
||||
|
||||
// //- Open a shared library. Return handle to library. Print error
|
||||
// // message if library cannot be loaded (check = true)
|
||||
|
Loading…
Reference in New Issue
Block a user