diff options
| author | Bjørn Mork <bjorn@mork.no> | 2018-01-22 10:29:20 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2018-01-22 10:35:23 +0100 |
| commit | cb7d865b60d72e5a0ae2d425153d91d4c17d896c (patch) | |
| tree | ef09745f184fe90cb532f313efefaf769bd52578 | |
| parent | ba41d9cc740ba23dc3a40efb992aadc4c4f90d98 (diff) | |
qmi-firmware-update: fix --ignore-version-errors
validate_firmware_config_carrier() would return FALSE even if we
set --ignore-version-errors, making this option non-functional.
And as we did not set "error" before returning here, we would
die with an assert failure on return.
Signed-off-by: Bjørn Mork <bjorn@mork.no>
(cherry picked from commit a311c0c278fdecc918d65e08602acef9dc1a6e86)
| -rw-r--r-- | src/qmi-firmware-update/qfu-updater.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qmi-firmware-update/qfu-updater.c b/src/qmi-firmware-update/qfu-updater.c index efe4f61..5338ae1 100644 --- a/src/qmi-firmware-update/qfu-updater.c +++ b/src/qmi-firmware-update/qfu-updater.c @@ -1223,11 +1223,11 @@ validate_firmware_config_carrier (QfuUpdater *self, "user provided carrier doesn't match the one in the specified images: " "'%s' != '%s'", self->priv->carrier, ctx->carrier); + return FALSE; } g_warning ("[qfu-updater] user provided carrier doesn't match the one in the specified images: " "'%s' != '%s' (IGNORED with --ignore-version-errors)", self->priv->carrier, ctx->carrier); - return FALSE; } /* No firmware version? */ |