summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2018-01-22 10:29:20 +0100
committerAleksander Morgado <aleksander@aleksander.es>2018-01-22 10:36:10 +0100
commit55b40d54e7c26d3b0297c8c32e0a9bcaaaf90a15 (patch)
tree6bf8e33989d697eb43fdc6d93db6f2358bbb2341
parent1488294ffc47b20fc09ef68228ccc5fe36397e74 (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.c2
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 53c2315..17b4378 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? */