From 0823d1960cf2baf4529f64dbfa1527b00277e408 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 12 Jan 2016 15:13:02 +0100 Subject: [PATCH] install: Fix printing of NULL in already-installed error message --- app/xdg-app-builtins-install.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/xdg-app-builtins-install.c b/app/xdg-app-builtins-install.c index 2d777d981..ba5c34f1e 100644 --- a/app/xdg-app-builtins-install.c +++ b/app/xdg-app-builtins-install.c @@ -135,7 +135,7 @@ xdg_app_builtin_install_runtime (int argc, char **argv, GCancellable *cancellabl deploy_base = xdg_app_dir_get_deploy_dir (dir, ref); if (g_file_query_exists (deploy_base, cancellable)) { - xdg_app_fail (error, "Runtime %s branch %s already installed", runtime, branch); + xdg_app_fail (error, "Runtime %s branch %s already installed", runtime, branch ? branch : "master"); goto out; } @@ -216,7 +216,7 @@ xdg_app_builtin_install_app (int argc, char **argv, GCancellable *cancellable, G deploy_base = xdg_app_dir_get_deploy_dir (dir, ref); if (g_file_query_exists (deploy_base, cancellable)) { - xdg_app_fail (error, "App %s branch %s already installed", app, branch); + xdg_app_fail (error, "App %s branch %s already installed", app, branch ? branch : "master"); goto out; }