proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-15 10:29:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: fu-util/fu-tool: explicitly block unsupported flags

Browse Source 
Recently had a discussion on the expected behavior of calling
`#fwupdmgr update`/`fwupdtool update` with `--allow-reinstall`
in place.

It wasn't working which was confusing to the reporter, but I
feel that flag should only be usable with `install`.  Upgrades
are for upgrades and downgrades are for downgrades.  Reinstalls are
for reinstall.
This commit is contained in:
Mario Limonciello 2019-11-14 10:26:44 -06:00 committed by Mario Limonciello
parent f7006d2baa
commit 0f109b0d97
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fu-tool.c
View File

@ -1014,6 +1014,22 @@ fu_util_update_by_id (FuUtilPrivate *priv, const gchar *device_id, GError **erro
static gboolean static gboolean
fu_util_update (FuUtilPrivate *priv, gchar **values, GError **error) fu_util_update (FuUtilPrivate *priv, gchar **values, GError **error)
{ {
if (priv->flags & FWUPD_INSTALL_FLAG_ALLOW_OLDER) {
g_set_error_literal (error,
FWUPD_ERROR,
FWUPD_ERROR_INVALID_ARGS,
"--allow-older is not supported for this command");
return FALSE;
}
if (priv->flags & FWUPD_INSTALL_FLAG_ALLOW_REINSTALL) {
g_set_error_literal (error,
FWUPD_ERROR,
FWUPD_ERROR_INVALID_ARGS,
"--allow-reinstall is not supported for this command");
return FALSE;
}
if (g_strv_length (values) > 1) { if (g_strv_length (values) > 1) {
g_set_error_literal (error, g_set_error_literal (error,
FWUPD_ERROR, FWUPD_ERROR,

24
src/fu-util.c
View File

@ -1914,6 +1914,22 @@ fu_util_update_by_id (FuUtilPrivate *priv, const gchar *device_id, GError **erro
static gboolean static gboolean
fu_util_update (FuUtilPrivate *priv, gchar **values, GError **error) fu_util_update (FuUtilPrivate *priv, gchar **values, GError **error)
{ {
if (priv->flags & FWUPD_INSTALL_FLAG_ALLOW_OLDER) {
g_set_error_literal (error,
FWUPD_ERROR,
FWUPD_ERROR_INVALID_ARGS,
"--allow-older is not supported for this command");
return FALSE;
}
if (priv->flags & FWUPD_INSTALL_FLAG_ALLOW_REINSTALL) {
g_set_error_literal (error,
FWUPD_ERROR,
FWUPD_ERROR_INVALID_ARGS,
"--allow-reinstall is not supported for this command");
return FALSE;
}
if (g_strv_length (values) == 0) if (g_strv_length (values) == 0)
return fu_util_update_all (priv, error); return fu_util_update_all (priv, error);
if (g_strv_length (values) == 1) if (g_strv_length (values) == 1)
@ -1987,6 +2003,14 @@ fu_util_downgrade (FuUtilPrivate *priv, gchar **values, GError **error)
g_autoptr(FwupdRelease) rel = NULL; g_autoptr(FwupdRelease) rel = NULL;
g_autoptr(GPtrArray) rels = NULL; g_autoptr(GPtrArray) rels = NULL;
if (priv->flags & FWUPD_INSTALL_FLAG_ALLOW_REINSTALL) {
g_set_error_literal (error,
FWUPD_ERROR,
FWUPD_ERROR_INVALID_ARGS,
"--allow-reinstall is not supported for this command");
return FALSE;
}
priv->filter_include |= FWUPD_DEVICE_FLAG_SUPPORTED; priv->filter_include |= FWUPD_DEVICE_FLAG_SUPPORTED;
dev = fu_util_get_device_or_prompt (priv, values, error); dev = fu_util_get_device_or_prompt (priv, values, error);
if (dev == NULL) if (dev == NULL)