marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
tingping/wmclass
Matthew Leeds 2017-03-27 15:31:34 -05:00 committed by Alexander Larsson
parent 23b2eb6383
commit d272a4d4cc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builder/builder-manifest.c
View File

@ -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));
}
}