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

Merge pull request #333 from smcv/brz 

bzr: Run brz in preference to bzr
master
Matthew Leeds 2020-03-20 16:48:50 -07:00 committed by GitHub
parent 66d2a68337 48761e778a
commit 5246220826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/builder-source-bzr.c
View File

@ -120,11 +120,14 @@ bzr (GFile *dir,
GError **error,
...)
{
g_autofree char *brz = NULL;
gboolean res;
va_list ap;
brz = g_find_program_in_path ("brz");
va_start (ap, error);
res = flatpak_spawn (dir, output, 0, error, "bzr", ap);
res = flatpak_spawn (dir, output, 0, error, brz ? brz : "bzr", ap);
va_end (ap);
return res;