From 9426438c0bbcb08fa3dcb940e0c514a975d73f39 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 14 Apr 2016 19:11:48 -0400 Subject: Fix --run I have a manifest which has --command=terminix in the finish-args, and xdg-app build doesn't like that option, so filter it out. --- builder/builder-manifest.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'builder') diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c index b89e5b6..26f6f33 100644 --- a/builder/builder-manifest.c +++ b/builder/builder-manifest.c @@ -1980,14 +1980,16 @@ builder_manifest_run (BuilderManifest *self, g_ptr_array_add (args, g_strdup_printf ("--env=%s", env[i])); } - /* Inherit all finish args except the filesystem ones so the - * command gets the same access as the final app */ + /* Inherit all finish args except the filesystem and command + * ones so the command gets the same access as the final app + */ if (self->finish_args) { for (i = 0; self->finish_args[i] != NULL; i++) { const char *arg = self->finish_args[i]; - if (!g_str_has_prefix (arg, "--filesystem")) + if (!g_str_has_prefix (arg, "--filesystem") && + !g_str_has_prefix (arg, "--command")) g_ptr_array_add (args, g_strdup (arg)); } } -- cgit v1.2.1