keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

app/status: Handle auto-update service running

Browse Source 
If the `rpm-ostreed-automatic.service` unit is running while a user runs
`status`, we would incorrectly print `no runs since boot`. Check for
this case and just show the state as `running`.

Closes: #1291
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-03-07 20:26:04 +00:00 committed by Atomic Bot
parent bc61769c8c
commit 9d92684afb
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/rpmostree-builtin-status.c
View File

@ -180,7 +180,8 @@ typedef enum {
AUTO_UPDATE_SDSTATE_TIMER_UNKNOWN,
AUTO_UPDATE_SDSTATE_TIMER_INACTIVE,
AUTO_UPDATE_SDSTATE_SERVICE_FAILED,
AUTO_UPDATE_SDSTATE_OK,
AUTO_UPDATE_SDSTATE_SERVICE_RUNNING,
AUTO_UPDATE_SDSTATE_SERVICE_EXITED,
} AutoUpdateSdState;
static gboolean
@ -234,6 +235,11 @@ get_last_auto_update_run (GDBusConnection *connection,
*out_state = AUTO_UPDATE_SDSTATE_SERVICE_FAILED;
return TRUE; /* NB early return */
}
else if (g_str_equal (service_state, "active"))
{
*out_state = AUTO_UPDATE_SDSTATE_SERVICE_RUNNING;
return TRUE; /* NB early return */
}
g_autoptr(GDBusProxy) service_proxy =
g_dbus_proxy_new_sync (connection, G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, NULL,
@ -257,7 +263,7 @@ get_last_auto_update_run (GDBusConnection *connection,
}
}
*out_state = AUTO_UPDATE_SDSTATE_OK;
*out_state = AUTO_UPDATE_SDSTATE_SERVICE_EXITED;
*out_last_run = g_steal_pointer (&last_run);
return TRUE;
}
@ -314,7 +320,12 @@ print_daemon_state (RPMOSTreeSysroot *sysroot_proxy,
get_bold_end (), get_red_end ());
break;
}
case AUTO_UPDATE_SDSTATE_OK:
case AUTO_UPDATE_SDSTATE_SERVICE_RUNNING:
{
g_print ("(%s; running)\n", policy);
break;
}
case AUTO_UPDATE_SDSTATE_SERVICE_EXITED:
{
if (last_run)
/* e.g. "last run 4h 32min ago" */