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

Fix a couple bugs in the sysadm/update check routine. Now it will report "rebootneeded" when the system is waiting to reboot to apply updates, and it allows for multiple "patch" entries now.

Browse Source
This commit is contained in:
Ken Moore
2016-03-18 15:16:02 -04:00
parent 4b160e2982
commit 638f0eb390
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/library/sysadm-update.cpp
View File

@@ -17,10 +17,14 @@ using namespace sysadm;
// Return a list of updates available
QJsonObject Update::checkUpdates() {
QJsonObject retObject;
if(QFile::exists("/tmp/.rebootrequired")){
retObject.insert("status","rebootrequired");
return retObject;
}
QStringList output = General::RunCommand("pc-updatemanager check").split("\n");
QString nameval;
int pnum=1;
for ( int i = 0; i < output.size(); i++)
{
if ( output.at(i).indexOf("Your system is up to date!") != -1 )
@@ -56,7 +60,8 @@ QJsonObject Update::checkUpdates() {
itemvals.insert("date", output.at(i+3).section(" ", 1, 1));
if ( output.size() > ( i + 4) )
itemvals.insert("size", output.at(i+4).section(" ", 1, 1));
retObject.insert("patch", itemvals);
retObject.insert("patch"+QString::number(pnum), itemvals);
pnum++;
}
if ( output.at(i).indexOf("TYPE: PKGUPDATE") != -1 ) {
QJsonObject itemvals;