non ymp builder target allowed when usrmerge enabled

turkman-linux · May 26, 2024 · e934349 · e934349
1 parent 3af0090
commit e934349
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/operations/package-manager/build.vala b/src/operations/package-manager/build.vala
@@ -2,10 +2,6 @@ private bool no_src = false;
 private static int build_operation (string[] args) {
     string current_directory=pwd ();
     string[] new_args = args;
-    if (usr_is_merged ()) {
-        error_add (_ ("Build operation with usrmerge is not allowed!"));
-        error (31);
-    }
     if (new_args.length == 0) {
         new_args = {pwd()};
     }

diff --git a/src/util/builder_target/ymp.vala b/src/util/builder_target/ymp.vala
@@ -1,4 +1,8 @@
 public void build_target_ymp_init() {
+   if (usr_is_merged ()) {
+        error_add (_ ("Build operation with usrmerge is not allowed!"));
+        error (31);
+    }
     build_target ymp_target = new build_target();
     ymp_target.suffix = "ymp";
     ymp_target.name = "ymp";