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

Remove some comments from the pkg interface, and make sure the dispatcher sends out a full update when starting for the first time (in case the proc is a special subsystem process).

Browse Source
This commit is contained in:
Ken Moore
2016-03-31 10:09:37 -04:00
parent 341a546c4b
commit e5d8c33b81
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/Dispatcher.cpp
View File

@@ -48,6 +48,7 @@ void DProcess::startProc(){
//setup internal connections
connect(this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(cmdFinished(int, QProcess::ExitStatus)) );
connect(this, SIGNAL(error(QProcess::ProcessError)), this, SLOT(cmdError(QProcess::ProcessError)) );
this->emit ProcUpdate(ID, proclog);
}
cCmd = cmds.takeFirst();
success = false; //not finished yet

4
src/server/library/sysadm-pkg.cpp
View File

@@ -122,11 +122,9 @@ QJsonObject PKG::pkg_info(QStringList origins, QString repo, QString category, b
}
//ANNOTATIONS
QSqlQuery q2("SELECT tag_id, value_id FROM pkg_annotation WHERE package_id = '"+id+"'");
QStringList tags, vals;
QStringList tags, vals; //both the value and the variable are id tags to entries in the annotations table.
while(q2.next()){
tags << q2.value("tag_id").toString(); vals << q2.value("value_id").toString();
//include the annotations as base-level fields as well
//info.insert( anno_from_id(q2.value("tag_id").toString()), anno_from_id(q2.value("value_id").toString()) );
}
if(!tags.isEmpty()){ annotations_from_ids(tags, vals, &info); }
if(!fullresults){ retObj.insert(origin,info); continue; } //skip the rest of the info queries