From 55de45a0bb72efe372adb580434d12bf06012078 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Thu, 30 May 2013 15:29:27 +0200 Subject: [PATCH] preprocessor: config file: if on Windows machine and operatingSystem is empty, then check to see if password or remoteDrive is empty. otherwise, don't check --- ConfigFile.cc | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/ConfigFile.cc b/ConfigFile.cc index c0c17857..61ebf2e4 100644 --- a/ConfigFile.cc +++ b/ConfigFile.cc @@ -517,15 +517,18 @@ ConfigFile::checkPass(WarningConsolidation &warnings) const exit(EXIT_FAILURE); } #if defined(_WIN32) || defined(__CYGWIN32__) - if (it->second->password.empty()) + if (it->second->operatingSystem.empty()) { - cerr << "ERROR (node " << it->first << "): the Password option must be passed under Windows for every remote node." << endl; - exit(EXIT_FAILURE); - } - if (it->second->remoteDrive.empty()) - { - cerr << "ERROR (node " << it->first << "): the RemoteDrive option must be passed under Windows for every remote node." << endl; - exit(EXIT_FAILURE); + if (it->second->password.empty()) + { + cerr << "ERROR (node " << it->first << "): the Password option must be passed under Windows for every remote node." << endl; + exit(EXIT_FAILURE); + } + if (it->second->remoteDrive.empty()) + { + cerr << "ERROR (node " << it->first << "): the RemoteDrive option must be passed under Windows for every remote node." << endl; + exit(EXIT_FAILURE); + } } #endif if (it->second->remoteDirectory.empty())