From 08421951029b749c2a89015380a198f001321894 Mon Sep 17 00:00:00 2001 From: sulincix Date: Wed, 16 Oct 2024 09:42:21 +0000 Subject: [PATCH] fix ymp builder install operation --- src/operations/package-manager/build.vala | 5 +++++ src/util/build.vala | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/operations/package-manager/build.vala b/src/operations/package-manager/build.vala index baa68b0..1c7edf2 100755 --- a/src/operations/package-manager/build.vala +++ b/src/operations/package-manager/build.vala @@ -13,6 +13,11 @@ private static int build_operation (string[] args) { error_add("Build path: %s (%s)".printf(bd.ymp_build.ympbuild_buildpath, arg)); return r; } + if(get_bool("install")) { + quarantine_import_from_path(bd.ymp_build.ympbuild_buildpath); + quarantine_install (); + quarantine_reset (); + } } cd (current_directory); return 0; diff --git a/src/util/build.vala b/src/util/build.vala index df9fda8..05f3956 100755 --- a/src/util/build.vala +++ b/src/util/build.vala @@ -180,15 +180,7 @@ public class builder { restore_env(); return 1; } - if (get_bool("install")) { - if (0 != install_main({ - binpkg - })) { - set_bool("unsafe", unsafe); - restore_env(); - return 1; - } - } + string target = output + "/" + output_package_name + "_" + build_target.arch + "." + build_target.suffix; move_file(binpkg, target); }