proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-05-20 21:04:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop showing the current release during updates in fwupdmgr

Browse Source 
With handling composite CAB files this information isn't relayed to the
frontend on which release is being handled, but was rather guessed.

Avoid showing invalid information in this instance.
This commit is contained in:
Mario Limonciello 2018-10-09 15:52:45 -05:00 committed by Mario Limonciello
parent dc48bec157
commit 91353d48bd
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fu-util.c
View File

@ -60,7 +60,6 @@ typedef struct {
/* only valid in update and downgrade */ /* only valid in update and downgrade */
FuUtilOperation current_operation; FuUtilOperation current_operation;
FwupdDevice *current_device; FwupdDevice *current_device;
FwupdRelease *current_release;
} FuUtilPrivate; } FuUtilPrivate;
typedef gboolean (*FuUtilPrivateCb) (FuUtilPrivate *util, typedef gboolean (*FuUtilPrivateCb) (FuUtilPrivate *util,
@ -213,18 +212,14 @@ fu_util_update_device_changed_cb (FwupdClient *client,
/* show message in progressbar */ /* show message in progressbar */
if (priv->current_operation == FU_UTIL_OPERATION_UPDATE) { if (priv->current_operation == FU_UTIL_OPERATION_UPDATE) {
/* TRANSLATORS: %1 is a device name, and %2 and %3 are version numbers */ /* TRANSLATORS: %1 is a device name */
str = g_strdup_printf (_("Updating %s from %s to %s…"), str = g_strdup_printf (_("Updating %s…"),
fwupd_device_get_name (device), fwupd_device_get_name (device));
fwupd_device_get_version (device),
fwupd_release_get_version (priv->current_release));
fu_progressbar_set_title (priv->progressbar, str); fu_progressbar_set_title (priv->progressbar, str);
} else if (priv->current_operation == FU_UTIL_OPERATION_DOWNGRADE) { } else if (priv->current_operation == FU_UTIL_OPERATION_DOWNGRADE) {
/* TRANSLATORS: %1 is a device name, and %2 and %3 are version numbers */ /* TRANSLATORS: %1 is a device name */
str = g_strdup_printf (_("Downgrading %s from %s to %s…"), str = g_strdup_printf (_("Downgrading %s…"),
fwupd_device_get_name (device), fwupd_device_get_name (device));
fwupd_device_get_version (device),
fwupd_release_get_version (priv->current_release));
fu_progressbar_set_title (priv->progressbar, str); fu_progressbar_set_title (priv->progressbar, str);
} else if (priv->current_operation == FU_UTIL_OPERATION_INSTALL) { } else if (priv->current_operation == FU_UTIL_OPERATION_INSTALL) {
/* TRANSLATORS: %1 is a device name */ /* TRANSLATORS: %1 is a device name */
@ -2029,7 +2024,6 @@ fu_util_update_device_with_release (FuUtilPrivate *priv,
fwupd_checksum_get_best (checksums), fwupd_checksum_get_best (checksums),
error)) error))
return FALSE; return FALSE;
g_set_object (&priv->current_release, rel);
return fwupd_client_install (priv->client, return fwupd_client_install (priv->client,
fwupd_device_get_id (dev), fn, fwupd_device_get_id (dev), fn,
priv->flags, NULL, error); priv->flags, NULL, error);
@ -2248,8 +2242,6 @@ fu_util_private_free (FuUtilPrivate *priv)
g_object_unref (priv->client); g_object_unref (priv->client);
if (priv->current_device != NULL) if (priv->current_device != NULL)
g_object_unref (priv->current_device); g_object_unref (priv->current_device);
if (priv->current_release != NULL)
g_object_unref (priv->current_release);
if (priv->soup_session != NULL) if (priv->soup_session != NULL)
g_object_unref (priv->soup_session); g_object_unref (priv->soup_session);
g_main_loop_unref (priv->loop); g_main_loop_unref (priv->loop);