got rid of a number of ifdefs which should not be needed anymore
This commit is contained in:
@@ -28,6 +28,9 @@ using namespace std;
|
||||
|
||||
bool checkRetryFailed(RclConfig *conf, bool record)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
return true;
|
||||
#else
|
||||
string cmd;
|
||||
|
||||
if (!conf->getConfParam("checkneedretryindexscript", cmd)) {
|
||||
@@ -51,4 +54,5 @@ bool checkRetryFailed(RclConfig *conf, bool record)
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -556,11 +556,9 @@ int main(int argc, char **argv)
|
||||
if (op_flags & OPT_k) {
|
||||
indexerFlags &= ~ConfIndexer::IxFNoRetryFailed;
|
||||
} else {
|
||||
#ifndef _WIN32
|
||||
if (checkRetryFailed(config, false)) {
|
||||
indexerFlags &= ~ConfIndexer::IxFNoRetryFailed;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Pidfile pidfile(config->getPidfile());
|
||||
@@ -684,12 +682,10 @@ int main(int argc, char **argv)
|
||||
"not going into monitor mode\n"));
|
||||
exit(1);
|
||||
} else {
|
||||
#ifndef _WIN32
|
||||
// Record success of indexing pass with failed files retries.
|
||||
if (!(indexerFlags & ConfIndexer::IxFNoRetryFailed)) {
|
||||
checkRetryFailed(config, true);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
deleteZ(confindexer);
|
||||
#ifndef _WIN32
|
||||
@@ -727,12 +723,10 @@ int main(int argc, char **argv)
|
||||
makeIndexerOrExit(config, inPlaceReset);
|
||||
bool status = confindexer->index(rezero, ConfIndexer::IxTAll,
|
||||
indexerFlags);
|
||||
#ifndef _WIN32
|
||||
// Record success of indexing pass with failed files retries.
|
||||
if (status && !(indexerFlags & ConfIndexer::IxFNoRetryFailed)) {
|
||||
checkRetryFailed(config, true);
|
||||
}
|
||||
#endif
|
||||
if (!status)
|
||||
cerr << "Indexing failed" << endl;
|
||||
if (!confindexer->getReason().empty())
|
||||
|
||||
Reference in New Issue
Block a user