summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-11-16 00:35:25 +0000
committerZac Medico <zmedico@gentoo.org>2009-11-16 00:35:25 +0000
commitccaafff7115fae44c6035eb33e96b28f9d985c65 (patch)
tree0f320b89ec8d08a56cfaf80b85d7ba5d2de3f13b
parentIn the code from bug #288083, only show one LICENSE masking message per slot. (diff)
downloadportage-multirepo-2.1.7.5.tar.gz
portage-multirepo-2.1.7.5.tar.bz2
portage-multirepo-2.1.7.5.zip
Remove SLOT.missing since SLOT.invalid handles that case now. (trunk r14824)v2.1.7.5
svn path=/main/branches/2.1.7/; revision=14841
-rwxr-xr-xbin/repoman5
-rw-r--r--man/repoman.15
2 files changed, 3 insertions, 7 deletions
diff --git a/bin/repoman b/bin/repoman
index 79c55e44..eb3f449b 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -283,8 +283,7 @@ qahelp={
"EAPI.definition":"EAPI is defined after an inherit call (must be defined before)",
"EAPI.incompatible":"Ebuilds that use features that are only available with a different EAPI",
"EAPI.unsupported":"Ebuilds that have an unsupported EAPI version (you must upgrade portage)",
- "SLOT.invalid":"Ebuilds that have an invalid SLOT variable value",
- "SLOT.missing":"Ebuilds that have a missing or empty SLOT variable",
+ "SLOT.invalid":"Ebuilds that have a missing or invalid SLOT variable value",
"HOMEPAGE.missing":"Ebuilds that have a missing or empty HOMEPAGE variable",
"DEPEND.bad":"User-visible ebuilds with bad DEPEND settings (matched against *visible* ebuilds)",
"RDEPEND.bad":"User-visible ebuilds with bad RDEPEND settings (matched against *visible* ebuilds)",
@@ -388,7 +387,7 @@ qawarnings = set((
non_ascii_re = re.compile(r'[^\x00-\x7f]')
-missingvars=["KEYWORDS","LICENSE","DESCRIPTION","HOMEPAGE","SLOT"]
+missingvars = ["KEYWORDS", "LICENSE", "DESCRIPTION", "HOMEPAGE"]
allvars = set(x for x in portage.auxdbkeys if not x.startswith("UNUSED_"))
allvars.update(Package.metadata_keys)
allvars = sorted(allvars)
diff --git a/man/repoman.1 b/man/repoman.1
index 6c08ebf0..ab54f5bd 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -207,10 +207,7 @@ Syntax error in PROPERTIES (usually an extra/missing space/parenthesis)
.B RESTRICT.syntax
Syntax error in RESTRICT (usually an extra/missing space/parenthesis)
.B SLOT.invalid
-Ebuilds that have an invalid SLOT variable value
-.TP
-.B SLOT.missing
-Ebuilds that have a missing or empty SLOT variable
+Ebuilds that have a missing or invalid SLOT variable value
.TP
.B SRC_URI.mirror
A uri listed in profiles/thirdpartymirrors is found in SRC_URI