qmi-firmware-update: rename --force to --ignore-version-errors

The --force name is too generic, and we may want to have other similar flags.

5 files changed, 24 insertions, 24 deletions

diff --git a/src/qmi-firmware-update/qfu-main.c b/src/qmi-firmware-update/qfu-main.c
index cdacc52..5cc2a2b 100644
--- a/src/qmi-firmware-update/qfu-main.c
+++ b/src/qmi-firmware-update/qfu-main.c
@@ -55,7 +55,7 @@ static gchar     *config_version_str;
 static gchar     *carrier_str;
 static gboolean   device_open_proxy_flag;
 static gboolean   device_open_mbim_flag;
-static gboolean   force_flag;
+static gboolean   ignore_version_errors_flag;
 static gboolean   skip_validation_flag;
 
 /* Reset */
@@ -208,8 +208,8 @@ static GOptionEntry context_update_entries[] = {
       "Carrier name (e.g. 'Generic').",
       "[CARRIER]",
     },
-    { "force", 0, 0, G_OPTION_ARG_NONE, &force_flag,
-      "Force update operation even with version string errors.",
+    { "ignore-version-errors", 0, 0, G_OPTION_ARG_NONE, &ignore_version_errors_flag,
+      "Run update operation even with version string errors.",
       NULL
     },
     { "skip-validation", 0, 0, G_OPTION_ARG_NONE, &skip_validation_flag,
@@ -556,7 +556,7 @@ int main (int argc, char **argv)
                                            carrier_str,
                                            device_open_proxy_flag,
                                            device_open_mbim_flag,
-                                           force_flag,
+                                           ignore_version_errors_flag,
                                            skip_validation_flag);
         goto out;
     }
diff --git a/src/qmi-firmware-update/qfu-operation-update.c b/src/qmi-firmware-update/qfu-operation-update.c
index 317b14e..f079c8d 100644
--- a/src/qmi-firmware-update/qfu-operation-update.c
+++ b/src/qmi-firmware-update/qfu-operation-update.c
@@ -64,7 +64,7 @@ run_ready (QfuUpdater        *updater,
     if (!qfu_updater_run_finish (updater, res, &error)) {
         g_printerr ("error: %s\n", error->message);
         if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED))
-            g_printerr ("note: you can ignore this error using --force\n");
+            g_printerr ("note: you can ignore this error using --ignore-version-errors\n");
         g_error_free (error);
     } else {
         g_print ("firmware update operation finished successfully\n");
@@ -123,7 +123,7 @@ qfu_operation_update_run (const gchar        **images,
                           const gchar         *carrier,
                           gboolean             device_open_proxy,
                           gboolean             device_open_mbim,
-                          gboolean             force,
+                          gboolean             ignore_version_errors,
                           gboolean             skip_validation)
 {
     QfuUpdater *updater = NULL;
@@ -137,7 +137,7 @@ qfu_operation_update_run (const gchar        **images,
                                carrier,
                                device_open_proxy,
                                device_open_mbim,
-                               force,
+                               ignore_version_errors,
                                skip_validation);
     result = operation_update_run (updater, images);
     g_object_unref (updater);
diff --git a/src/qmi-firmware-update/qfu-operation.h b/src/qmi-firmware-update/qfu-operation.h
index a7bab9d..0edb373 100644
--- a/src/qmi-firmware-update/qfu-operation.h
+++ b/src/qmi-firmware-update/qfu-operation.h
@@ -34,7 +34,7 @@ gboolean qfu_operation_update_run     (const gchar        **images,
                                        const gchar         *carrier,
                                        gboolean             device_open_proxy,
                                        gboolean             device_open_mbim,
-                                       gboolean             force,
+                                       gboolean             ignore_version_errors,
                                        gboolean             skip_validation);
 gboolean qfu_operation_update_qdl_run (const gchar        **images,
                                        QfuDeviceSelection  *device_selection);
diff --git a/src/qmi-firmware-update/qfu-updater.c b/src/qmi-firmware-update/qfu-updater.c
index 398d697..5800f80 100644
--- a/src/qmi-firmware-update/qfu-updater.c
+++ b/src/qmi-firmware-update/qfu-updater.c
@@ -54,7 +54,7 @@ struct _QfuUpdaterPrivate {
     gchar              *carrier;
     gboolean            device_open_proxy;
     gboolean            device_open_mbim;
-    gboolean            force;
+    gboolean            ignore_version_errors;
     gboolean            skip_validation;
 };
 
@@ -936,7 +936,7 @@ validate_firmware_config_carrier (QfuUpdater  *self,
             if (!ctx->firmware_version)
                 ctx->firmware_version = g_strdup (firmware_version);
             else if (!g_str_equal (firmware_version, ctx->firmware_version)) {
-                if (!self->priv->force) {
+                if (!self->priv->ignore_version_errors) {
                     g_set_error (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED,
                                  "couldn't detect firmware version: "
                                  "firmware version strings don't match on specified images: "
@@ -945,7 +945,7 @@ validate_firmware_config_carrier (QfuUpdater  *self,
                     return FALSE;
                 }
                 g_warning ("firmware version strings don't match on specified images: "
-                           "'%s' != '%s' (IGNORED with --force)",
+                           "'%s' != '%s' (IGNORED with --ignore-version-errors)",
                            firmware_version, ctx->firmware_version);
             }
         }
@@ -954,7 +954,7 @@ validate_firmware_config_carrier (QfuUpdater  *self,
             if (!ctx->config_version)
                 ctx->config_version = g_strdup (config_version);
             else if (!g_str_equal (config_version, ctx->config_version)) {
-                if (!self->priv->force) {
+                if (!self->priv->ignore_version_errors) {
                     g_set_error (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED,
                                  "couldn't detect config version: "
                                  "config version strings don't match on specified images: "
@@ -963,7 +963,7 @@ validate_firmware_config_carrier (QfuUpdater  *self,
                     return FALSE;
                 }
                 g_warning ("[qfu-updater] config version strings don't match on specified images: "
-                           "'%s' != '%s' (IGNORED with --force)",
+                           "'%s' != '%s' (IGNORED with --ignore-version-errors)",
                            config_version, ctx->config_version);
             }
         }
@@ -972,7 +972,7 @@ validate_firmware_config_carrier (QfuUpdater  *self,
             if (!ctx->carrier)
                 ctx->carrier = g_strdup (carrier);
             else if (!g_str_equal (carrier, ctx->carrier)) {
-                if (!self->priv->force) {
+                if (!self->priv->ignore_version_errors) {
                     g_set_error (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED,
                                  "couldn't detect carrier: "
                                  "carrier strings don't match on specified images: "
@@ -981,7 +981,7 @@ validate_firmware_config_carrier (QfuUpdater  *self,
                     return FALSE;
                 }
                 g_warning ("[qfu-updater] carrier strings don't match on specified images: "
-                           "'%s' != '%s' (IGNORED with --force)",
+                           "'%s' != '%s' (IGNORED with --ignore-version-errors)",
                            carrier, ctx->carrier);
             }
         }
@@ -989,7 +989,7 @@ validate_firmware_config_carrier (QfuUpdater  *self,
 
     /* If given firmware version doesn't match the one in the image, error out */
     if (self->priv->firmware_version && (g_strcmp0 (self->priv->firmware_version, ctx->firmware_version) != 0)) {
-        if (!self->priv->force) {
+        if (!self->priv->ignore_version_errors) {
             g_set_error (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED,
                          "error validating firmware version: "
                          "user provided firmware version doesn't match the one in the specified images: "
@@ -998,13 +998,13 @@ validate_firmware_config_carrier (QfuUpdater  *self,
             return FALSE;
         }
         g_warning ("[qfu-updater] user provided firmware version doesn't match the one in the specified images: "
-                   "'%s' != '%s' (IGNORED with --force)",
+                   "'%s' != '%s' (IGNORED with --ignore-version-errors)",
                    self->priv->firmware_version, ctx->firmware_version);
     }
 
     /* If given config version doesn't match the one in the image, error out */
     if (self->priv->config_version && (g_strcmp0 (self->priv->config_version, ctx->config_version) != 0)) {
-        if (!self->priv->force) {
+        if (!self->priv->ignore_version_errors) {
             g_set_error (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED,
                          "error validating firmware version: "
                          "user provided firmware version doesn't match the one in the specified images: "
@@ -1013,13 +1013,13 @@ validate_firmware_config_carrier (QfuUpdater  *self,
             return FALSE;
         }
         g_warning ("[qfu-updater] user provided config version doesn't match the one in the specified images: "
-                   "'%s' != '%s' (IGNORED with --force)",
+                   "'%s' != '%s' (IGNORED with --ignore-version-errors)",
                    self->priv->firmware_version, ctx->firmware_version);
     }
 
     /* If given carrier doesn't match the one in the image, error out */
     if (self->priv->carrier && (g_strcmp0 (self->priv->carrier, ctx->carrier) != 0)) {
-        if (!self->priv->force) {
+        if (!self->priv->ignore_version_errors) {
             g_set_error (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED,
                          "error validating carrier: "
                          "user provided carrier doesn't match the one in the specified images: "
@@ -1027,7 +1027,7 @@ validate_firmware_config_carrier (QfuUpdater  *self,
                          self->priv->carrier, ctx->carrier);
         }
         g_warning ("[qfu-updater] user provided carrier doesn't match the one in the specified images: "
-                   "'%s' != '%s' (IGNORED with --force)",
+                   "'%s' != '%s' (IGNORED with --ignore-version-errors)",
                    self->priv->carrier, ctx->carrier);
         return FALSE;
     }
@@ -1280,7 +1280,7 @@ qfu_updater_new (QfuDeviceSelection *device_selection,
                  const gchar        *carrier,
                  gboolean            device_open_proxy,
                  gboolean            device_open_mbim,
-                 gboolean            force,
+                 gboolean            ignore_version_errors,
                  gboolean            skip_validation)
 {
     QfuUpdater *self;
@@ -1295,7 +1295,7 @@ qfu_updater_new (QfuDeviceSelection *device_selection,
     self->priv->firmware_version = (firmware_version ? g_strdup (firmware_version) : NULL);
     self->priv->config_version = (config_version ? g_strdup (config_version) : NULL);
     self->priv->carrier = (carrier ? g_strdup (carrier) : NULL);
-    self->priv->force = force;
+    self->priv->ignore_version_errors = ignore_version_errors;
     self->priv->skip_validation = skip_validation;
 
     return self;
diff --git a/src/qmi-firmware-update/qfu-updater.h b/src/qmi-firmware-update/qfu-updater.h
index 90eb57b..05b0631 100644
--- a/src/qmi-firmware-update/qfu-updater.h
+++ b/src/qmi-firmware-update/qfu-updater.h
@@ -56,7 +56,7 @@ QfuUpdater *qfu_updater_new        (QfuDeviceSelection   *device_selection,
                                     const gchar          *carrier,
                                     gboolean              device_open_proxy,
                                     gboolean              device_open_mbim,
-                                    gboolean              force,
+                                    gboolean              ignore_version_errors,
                                     gboolean              skip_validation);
 QfuUpdater *qfu_updater_new_qdl    (QfuDeviceSelection   *device_selection);
 void        qfu_updater_run        (QfuUpdater           *self,