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

--from-git: Allocate builddir before mirroring

tingping/wmclass
Alexander Larsson 2017-10-31 12:50:51 +01:00
parent 0fed4a6433
commit cb11d421f6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/builder-main.c
View File

@ -431,15 +431,6 @@ main (int argc,
const char *git_branch = opt_from_git_branch ? opt_from_git_branch : "master";
g_autoptr(GFile) build_subdir = NULL;
if (!builder_git_mirror_repo (opt_from_git,
NULL,
!opt_disable_updates, FALSE, FALSE, FALSE,
git_branch, build_context, &error))
{
g_printerr ("Can't clone manifest repo: %s\n", error->message);
return 1;
}
build_subdir = builder_context_allocate_build_subdir (build_context, manifest_basename, &error);
if (build_subdir == NULL)
{
@ -449,6 +440,15 @@ main (int argc,
cleanup_manifest_dir = g_object_ref (build_subdir);
if (!builder_git_mirror_repo (opt_from_git,
NULL,
!opt_disable_updates, FALSE, FALSE, FALSE,
git_branch, build_context, &error))
{
g_printerr ("Can't clone manifest repo: %s\n", error->message);
return 1;
}
if (!builder_git_checkout_dir (opt_from_git,
git_branch,
manifest_dirname,