github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 02:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Oops - fix a couple compile issues with the new iocage backend.

Browse Source
This commit is contained in:
Ken Moore
2017-02-16 12:23:43 -05:00
parent 8d479b4061
commit af7e620544
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/library/sysadm-iocage.cpp
View File

@@ -140,7 +140,7 @@ QJsonObject Iocage::fetchReleases(QJsonObject inobj){
QJsonObject retObject;
if(!inobj.contains("releases")){ return retObject; } //nothing to do
QStringList releases;
if(inobj.value("releases").isArray()){ releases = General::JsonArrayToString(inobj.value("releases").toArray()); }
if(inobj.value("releases").isArray()){ releases = General::JsonArrayToStringList(inobj.value("releases").toArray()); }
else if(inobj.value("releases").isString()){ releases << inobj.value("releases").toString(); }
//Now start up each of these downloads as appropriate
QStringList cids = DISPATCHER->listJobs().value("no_queue").toObject().keys(); //all currently running/pending jobs
@@ -152,7 +152,7 @@ QJsonObject Iocage::fetchReleases(QJsonObject inobj){
DISPATCHER->queueProcess(jobprefix+releases[i], "iocage fetch --verify -r "+releases[i]);
started << jobprefix+releases[i];
}
if(started.length>0){ retObject.insert("started_dispatcher_id", started); }
if(started.count()>0){ retObject.insert("started_dispatcher_id", started); }
return retObject;
}
@@ -160,7 +160,7 @@ QJsonObject Iocage::fetchPlugins(QJsonObject inobj){
QJsonObject retObject;
if(!inobj.contains("plugins")){ return retObject; } //nothing to do
QStringList plugins;
if(inobj.value("plugins").isArray()){ plugins = General::JsonArrayToString(inobj.value("plugins").toArray()); }
if(inobj.value("plugins").isArray()){ plugins = General::JsonArrayToStringList(inobj.value("plugins").toArray()); }
else if(inobj.value("plugins").isString()){ plugins << inobj.value("plugins").toString(); }
//Now start up each of these downloads as appropriate
QStringList cids = DISPATCHER->listJobs().value("no_queue").toObject().keys(); //all currently running/pending jobs
@@ -172,7 +172,7 @@ QJsonObject Iocage::fetchPlugins(QJsonObject inobj){
DISPATCHER->queueProcess(jobprefix+plugins[i], "iocage fetch --verify -P "+plugins[i]);
started << jobprefix+plugins[i];
}
if(started.length>0){ retObject.insert("started_dispatcher_id", started); }
if(started.count()>0){ retObject.insert("started_dispatcher_id", started); }
return retObject;
}
// Clean all templates on a box