aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-08-25 16:48:14 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-08-25 16:48:14 +0000
commit9ee25e297ecd44650d6a365f621ac3e07fedddb0 (patch)
treeda03cdb8e52c446037220a8f14b30cd9ebe0eb88
parent194a26263904b9397051959b4a077dabf4474d11 (diff)
downloadpaludis-9ee25e297ecd44650d6a365f621ac3e07fedddb0.tar.gz
paludis-9ee25e297ecd44650d6a365f621ac3e07fedddb0.tar.xz
Fix keywords altered by eclass check
-rw-r--r--paludis/ebuild.cc1
-rw-r--r--paludis/qa/keywords_check.cc2
-rw-r--r--paludis/version_metadata.sr1
3 files changed, 3 insertions, 1 deletions
diff --git a/paludis/ebuild.cc b/paludis/ebuild.cc
index 56b2514..b46154a 100644
--- a/paludis/ebuild.cc
+++ b/paludis/ebuild.cc
@@ -180,6 +180,7 @@ EbuildMetadataCommand::do_run_command(const std::string & cmd)
_metadata->license_string = f.get("LICENSE");
_metadata->description = f.get("DESCRIPTION");
_metadata->get_ebuild_interface()->keywords = f.get("KEYWORDS");
+ _metadata->get_ebuild_interface()->eclass_keywords = f.get("E_KEYWORDS");
_metadata->get_ebuild_interface()->inherited = f.get("INHERITED");
_metadata->get_ebuild_interface()->iuse = f.get("IUSE");
_metadata->deps.post_depend_string = f.get("PDEPEND");
diff --git a/paludis/qa/keywords_check.cc b/paludis/qa/keywords_check.cc
index 2f37f01..4e7ad37 100644
--- a/paludis/qa/keywords_check.cc
+++ b/paludis/qa/keywords_check.cc
@@ -63,7 +63,7 @@ KeywordsCheck::operator() (const EbuildCheckData & e) const
result << Message(qal_major, "Bad entries in KEYWORDS");
}
- if (! metadata->get_ebuild_interface()->keywords.empty())
+ if (! metadata->get_ebuild_interface()->eclass_keywords.empty())
result << Message(qal_major, "KEYWORDS was altered by an eclass");
}
catch (const InternalError &)
diff --git a/paludis/version_metadata.sr b/paludis/version_metadata.sr
index f224767..1a11ad0 100644
--- a/paludis/version_metadata.sr
+++ b/paludis/version_metadata.sr
@@ -48,6 +48,7 @@ make_class_EbuildVersionMetadata()
key src_uri std::string
key restrict_string std::string
key keywords std::string
+ key eclass_keywords std::string
key iuse std::string
key inherited std::string