From d272a4d4cce4ea6293593e603dcc2855100a34b2 Mon Sep 17 00:00:00 2001 From: Matthew Leeds Date: Mon, 27 Mar 2017 15:31:34 -0500 Subject: [PATCH] builder: Don't pass --require-version along to build The --require-version option works for build-finish but not build, so don't pass it along when using a manifest to build. --- builder/builder-manifest.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/builder/builder-manifest.c b/builder/builder-manifest.c index 65650e9a..5411cb92 100644 --- a/builder/builder-manifest.c +++ b/builder/builder-manifest.c @@ -2617,8 +2617,9 @@ builder_manifest_run (BuilderManifest *self, /* Just add something so that we get the default rules (own our own id) */ g_ptr_array_add (args, g_strdup ("--talk-name=org.freedesktop.DBus")); - /* Inherit all finish args except the filesystem and command - * ones so the command gets the same access as the final app + /* Inherit all finish args except --filesystem and some that + * build doesn't understand so the command gets the same access + * as the final app */ if (self->finish_args) { @@ -2629,7 +2630,8 @@ builder_manifest_run (BuilderManifest *self, !g_str_has_prefix (arg, "--extension") && !g_str_has_prefix (arg, "--sdk") && !g_str_has_prefix (arg, "--runtime") && - !g_str_has_prefix (arg, "--command")) + !g_str_has_prefix (arg, "--command") && + !g_str_has_prefix (arg, "--require-version")) g_ptr_array_add (args, g_strdup (arg)); } }