Skip to content

Topic/other minor fixes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ejoerns wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Topic/other minor fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e683bb9
src: provide more targeted error message for invalid slot format
ejoerns Nov 22, 2017
a81a73a
src/main: do not print 'Trying to contact rauc service' by default
ejoerns Dec 5, 2017
e5719f5
src/main: rename --override-boot-slot named argument
ejoerns Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/config_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ gboolean load_config(const gchar *filename, RaucConfig **config, GError **error)
error,
R_CONFIG_ERROR,
R_CONFIG_ERROR_INVALID_FORMAT,
"Invalid slot name format");
"Invalid slot name format: %s", groups[i]);
res = FALSE;
goto free;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ static gboolean install_start(int argc, char **argv)
g_printerr("Failed to connect completed signal\n");
goto out_loop;
}
g_print("Trying to contact rauc service\n");
g_debug("Trying to contact rauc service");
if (!r_installer_call_install_sync(installer, bundlelocation, NULL,
&error)) {
g_printerr("Failed %s\n", error->message);
Expand Down Expand Up @@ -945,7 +945,7 @@ static gboolean status_start(int argc, char **argv)
r_exit_status = 1;
goto out;
}
g_print("trying to contact rauc service\n");
g_debug("Trying to contact rauc service");
if (!r_installer_call_mark_sync(proxy, state, slot_identifier,
&slot_name, &message, NULL, &ierror)) {
message = g_strdup(ierror->message);
Expand Down Expand Up @@ -1036,7 +1036,7 @@ static void cmdline_handler(int argc, char **argv)
{"keyring", '\0', 0, G_OPTION_ARG_FILENAME, &keyring, "keyring file", "PEMFILE"},
{"intermediate", '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &intermediate, "intermediate CA file name", "PEMFILE"},
{"mount", '\0', 0, G_OPTION_ARG_FILENAME, &mount, "mount prefix", "PATH"},
{"override-boot-slot", '\0', 0, G_OPTION_ARG_STRING, &bootslot, "override auto-detection of booted slot", "SLOTNAME"},
{"override-boot-slot", '\0', 0, G_OPTION_ARG_STRING, &bootslot, "override auto-detection of booted slot", "BOOTNAME"},
{"handler-args", '\0', 0, G_OPTION_ARG_STRING, &handlerextra, "extra handler arguments", "ARGS"},
{"debug", 'd', 0, G_OPTION_ARG_NONE, &debug, "enable debug output", NULL},
{"version", '\0', 0, G_OPTION_ARG_NONE, &version, "display version", NULL},
Expand Down
2 changes: 1 addition & 1 deletion src/mark.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static RaucSlot* get_slot_by_identifier(const gchar *identifier, GError **error)
g_set_error(error,
R_SLOT_ERROR,
R_SLOT_ERROR_FAILED,
"Invalid slot name format");
"Invalid slot name format: '%s'", identifier);
}

g_strfreev(groupsplit);
Expand Down