Skip to content

Commit a9d386b

Browse files
dcbakerTingPing
authored andcommitted
builder-main: install platform as well as sdk if both are built
Tested building an SDK+Runtime and a Runtime without custom Sdk (thus no platform-id) Fixes: #630
1 parent f2d0567 commit a9d386b

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

src/builder-main.c

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,13 +1149,25 @@ main (int argc,
11491149
passed and there were no changes, do nothing in that case */
11501150
if (export_repo == NULL)
11511151
g_printerr ("NOTE: No export due to --require-changes, ignoring --install\n");
1152-
else if (!do_install (build_context, flatpak_file_get_path_cached (export_repo),
1153-
builder_manifest_get_id (manifest),
1154-
builder_manifest_get_branch (manifest, build_context),
1155-
&error))
1152+
else
11561153
{
1157-
g_printerr ("Install failed: %s\n", error->message);
1158-
return 1;
1154+
if (!do_install (build_context, flatpak_file_get_path_cached (export_repo),
1155+
builder_manifest_get_id (manifest),
1156+
builder_manifest_get_branch (manifest, build_context),
1157+
&error))
1158+
{
1159+
g_printerr ("Install failed: %s\n", error->message);
1160+
return 1;
1161+
}
1162+
if (builder_manifest_get_id_platform (manifest) &&
1163+
(!do_install (build_context, flatpak_file_get_path_cached (export_repo),
1164+
builder_manifest_get_id_platform (manifest),
1165+
builder_manifest_get_branch (manifest, build_context),
1166+
&error)))
1167+
{
1168+
g_printerr ("Install failed: %s\n", error->message);
1169+
return 1;
1170+
}
11591171
}
11601172
}
11611173

0 commit comments

Comments
 (0)