summaryrefslogtreecommitdiffstats
path: root/bin/repoman
diff options
context:
space:
mode:
Diffstat (limited to 'bin/repoman')
-rwxr-xr-xbin/repoman10
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/repoman b/bin/repoman
index 38b327328..e0cdf6ed4 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -592,11 +592,13 @@ repo_info = portdb._repo_info[portdir_overlay]
portdb.porttrees = list(repo_info.eclass_db.porttrees)
portdir = portdb.porttrees[0]
-# Thin manifests imply reliance on the VCS for file integrity,
-# which implies that manifest signatures are not needed.
-sign_manifests = "sign" in repoman_settings.features and not \
+# In order to disable manifest signatures, repos may set
+# "sign-manifests = false" in metadata/layout.conf. This
+# can be used to prevent merge conflicts like those that
+# thin-manifests is designed to prevent.
+sign_manifests = "sign" in repoman_settings.features and \
repoman_settings.repositories.get_repo_for_location(
- portdir_overlay).thin_manifest
+ portdir_overlay).sign_manifest
# Generate an appropriate PORTDIR_OVERLAY value for passing into the
# profile-specific config constructor calls.