[gnome-terminal] migration: Only allow --clean with --force
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal] migration: Only allow --clean with --force
- Date: Wed, 13 Mar 2013 14:23:00 +0000 (UTC)
commit f8968969f41970199e7a98f5335688142d5cff53
Author: Christian Persch <chpe gnome org>
Date: Wed Mar 13 14:13:22 2013 +0100
migration: Only allow --clean with --force
src/migration.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/src/migration.c b/src/migration.c
index 8f238e0..437471a 100644
--- a/src/migration.c
+++ b/src/migration.c
@@ -623,6 +623,7 @@ main (int argc,
GOptionContext *context;
GError *error = NULL;
GSettings *global_settings;
+ int rv = EXIT_SUCCESS;
setlocale (LC_ALL, "");
@@ -645,6 +646,16 @@ main (int argc,
global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA);
+ if (clean) {
+ if (!force) {
+ g_printerr ("--clean requires --force\n");
+ rv = EXIT_FAILURE;
+ goto out;
+ }
+
+ do_clean ();
+ }
+
if (g_settings_get_uint (global_settings, TERMINAL_SETTING_SCHEMA_VERSION) >= TERMINAL_SCHEMA_VERSION) {
if (verbose)
g_printerr ("Already migrated.\n");
@@ -652,9 +663,6 @@ main (int argc,
goto out;
}
- if (clean)
- do_clean ();
-
if (!migrate (global_settings, &error)) {
g_printerr ("Error: %s\n", error->message);
g_error_free (error);
@@ -674,5 +682,5 @@ main (int argc,
out:
g_object_unref (global_settings);
- return EXIT_SUCCESS;
+ return rv;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]