[patch] Correction on condition

userpatches-feature-v2.diff (text/plain), 1.34 KB, created by konsolebox on 2021-04-13 10:27:47 UTC

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index e7b0a41..de2c378 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -1094,6 +1094,7 @@ if ___eapi_has_eapply_user; then
 		local tagfile=${T}/.portage_user_patches_applied
 		[[ -f ${tagfile} ]] && return
 		>> "${tagfile}"
+		[[ " ${FEATURES} " == *" userpatches "* ]] || return 0
 
 		local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
 
diff --git a/cnf/make.globals b/cnf/make.globals
index b8bc90a..3441c65 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -61,7 +61,7 @@ FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs
           preserve-libs protect-owned qa-unresolved-soname-deps
           sandbox sfperms strict
           unknown-features-warn unmerge-logs unmerge-orphans userfetch
-          userpriv usersandbox usersync"
+          userpatches userpriv usersandbox usersync"
 
 # Ignore file collisions in /lib/modules since files inside this directory
 # are never unmerged, and therefore collisions must be ignored in order for
diff --git a/lib/portage/const.py b/lib/portage/const.py
index 7effcd8..6ebd35d 100644
--- a/lib/portage/const.py
+++ b/lib/portage/const.py
@@ -203,6 +203,7 @@ SUPPORTED_FEATURES       = frozenset([
 	"unmerge-orphans",
 	"unprivileged",
 	"userfetch",
+	"userpatches",
 	"userpriv",
 	"usersandbox",
 	"usersync",