[PATCH] qmi-firmware-update: fix --ignore-version-errors

Bjørn Mork bjorn at mork.no
Mon Jan 22 09:29:20 UTC 2018


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 at mork.no>
---
 src/qmi-firmware-update/qfu-updater.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qmi-firmware-update/qfu-updater.c b/src/qmi-firmware-update/qfu-updater.c
index f74f8a37fcdc..6c18c3a57512 100644
--- a/src/qmi-firmware-update/qfu-updater.c
+++ b/src/qmi-firmware-update/qfu-updater.c
@@ -1238,11 +1238,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? */
-- 
2.11.0



More information about the libqmi-devel mailing list