Merge pull request #2255 from matthiasclasen/cmdline-errors

Commandline errors

4 files changed, 14 insertions, 4 deletions

diff --git a/app/flatpak-builtins-build-bundle.c b/app/flatpak-builtins-build-bundle.c
index c4af1d25..281d39ea 100644
--- a/app/flatpak-builtins-build-bundle.c
+++ b/app/flatpak-builtins-build-bundle.c
@@ -574,9 +574,10 @@ flatpak_builtin_build_bundle (int argc, char **argv, GCancellable *cancellable,
     return flatpak_fail (error, _("'%s' is not a valid repository"), location);
 
   if (!ostree_repo_open (repo, cancellable, error))
-    return FALSE;
-
-  file = g_file_new_for_commandline_arg (filename);
+    {
+      g_prefix_error (error, _("'%s' is not a valid repository: "), location);
+      return FALSE;
+    }
 
   if (ostree_repo_resolve_rev (repo, name, FALSE, NULL, NULL))
     full_branch = g_strdup (name);
@@ -594,6 +595,11 @@ flatpak_builtin_build_bundle (int argc, char **argv, GCancellable *cancellable,
         full_branch = flatpak_build_app_ref (name, branch, opt_arch);
     }
 
+  file = g_file_new_for_commandline_arg (filename);
+
+  if (flatpak_file_get_path_cached (file) == NULL)
+    return flatpak_fail (error, _("'%s' is not a valid filename"), filename);
+
   if (opt_oci)
     {
       if (!build_oci (repo, file, name, full_branch, cancellable, error))
diff --git a/app/flatpak-builtins-build-commit-from.c b/app/flatpak-builtins-build-commit-from.c
index 13467783..9efe3d7d 100644
--- a/app/flatpak-builtins-build-commit-from.c
+++ b/app/flatpak-builtins-build-commit-from.c
@@ -236,7 +236,7 @@ flatpak_builtin_build_commit_from (int argc, char **argv, GCancellable *cancella
   guint64 timestamp;
   int i;
 
-  context = g_option_context_new (_("DST-REPO [DST-REF]... - Make a new commit based on existing commit(s)"));
+  context = g_option_context_new (_("DST-REPO [DST-REF]... - Make a new commit from existing commits"));
   g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
 
   if (!flatpak_option_context_parse (context, options, &argc, &argv, FLATPAK_BUILTIN_FLAG_NO_DIR, NULL, cancellable, error))
diff --git a/app/flatpak-builtins-build-import-bundle.c b/app/flatpak-builtins-build-import-bundle.c
index 97968f65..baa668a6 100644
--- a/app/flatpak-builtins-build-import-bundle.c
+++ b/app/flatpak-builtins-build-import-bundle.c
@@ -192,6 +192,8 @@ flatpak_builtin_build_import (int argc, char **argv, GCancellable *cancellable,
     return flatpak_fail (error, _("'%s' is not a valid repository"), location);
 
   file = g_file_new_for_commandline_arg (filename);
+  if (flatpak_file_get_path_cached (file) == NULL)
+    return flatpak_fail (error, _("'%s' is not a valid filename"), filename);
 
   if (!ostree_repo_open (repo, cancellable, error))
     return FALSE;
diff --git a/app/flatpak-builtins-build-init.c b/app/flatpak-builtins-build-init.c
index e741bf49..b2444078 100644
--- a/app/flatpak-builtins-build-init.c
+++ b/app/flatpak-builtins-build-init.c
@@ -247,6 +247,8 @@ flatpak_builtin_build_init (int argc, char **argv, GCancellable *cancellable, GE
     return FALSE;
 
   base = g_file_new_for_commandline_arg (directory);
+  if (flatpak_file_get_path_cached (base) == NULL)
+    return flatpak_fail (error, _("'%s' is not a valid filename"), directory);
 
   if (!flatpak_mkdir_p (base, cancellable, error))
     return FALSE;