maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added better error message when 'syncevolution' is started with non-existant sources as parameter 

git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@458 15ad00c4-1369-45f4-8270-35d70d36bdcd
This commit is contained in:
Patrick Ohly 2007-11-22 21:06:21 +00:00
parent 802f69d5b5
commit 1da4976ce7
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/EvolutionSyncClient.cpp
View File

@ -656,6 +656,7 @@ void EvolutionSyncClient::startLoopThread()
void EvolutionSyncClient::initSources(SourceList &sourceList, EvolutionClientConfig &config, const string &url)
{
SyncSourceConfig *sourceconfigs = config.getSyncSourceConfigs();
set<string> unmatchedSources = m_sources;
for (int index = 0; index < config.getNumSources(); index++) {
ManagementNode &node(*config.getSyncSourceNode(index));
SyncSourceConfig &sc(sourceconfigs[index]);
@ -672,6 +673,7 @@ void EvolutionSyncClient::initSources(SourceList &sourceList, EvolutionClientCon
overrideMode = SYNC_TWO_WAY;
enabled = true;
}
unmatchedSources.erase(sc.getName());
} else {
enabled = false;
}
@ -715,6 +717,21 @@ void EvolutionSyncClient::initSources(SourceList &sourceList, EvolutionClientCon
syncSource->open();
}
}
// check whether there were any sources specified which do not exist
if (unmatchedSources.size()) {
string sources;
for (set<string>::const_iterator it = unmatchedSources.begin();
it != unmatchedSources.end();
it++) {
if (sources.size()) {
sources += " ";
}
sources += *it;
}
throwError(string("no such source(s): ") + sources);
}
}
int EvolutionSyncClient::sync()