aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Morgan <david.morgan@wadham.oxford.ac.uk> 2006-06-27 22:52:28 +0000
committerAvatar David Morgan <david.morgan@wadham.oxford.ac.uk> 2006-06-27 22:52:28 +0000
commit0c4596c4df2aab658cb90c45f103850e3f97b805 (patch)
treea8b5ca7227b2e6fcc9abab75ba73e102fc161303
parentd8c201ded90be9222d30a0af19a06de0342af440 (diff)
downloadpaludis-0c4596c4df2aab658cb90c45f103850e3f97b805.tar.gz
paludis-0c4596c4df2aab658cb90c45f103850e3f97b805.tar.xz
Fixes for QAEnvironment and a few other qualudis things
-rw-r--r--paludis/qa/environment.cc10
-rw-r--r--paludis/qa/environment.hh24
-rw-r--r--paludis/qa/files.m438
3 files changed, 51 insertions, 21 deletions
diff --git a/paludis/qa/environment.cc b/paludis/qa/environment.cc
index e583ef7..0adee6d 100644
--- a/paludis/qa/environment.cc
+++ b/paludis/qa/environment.cc
@@ -24,8 +24,9 @@ using namespace paludis;
using namespace paludis::qa;
QAEnvironment::QAEnvironment(const FSEntry & base) :
- Environment(PackageDatabase::Pointer(new PackageDatabase))
+ Environment(PackageDatabase::Pointer(new PackageDatabase(this)))
{
+ MirrorIterator _mirrors;
std::map<std::string, std::string> keys;
keys.insert(std::make_pair(std::string("format"), std::string("portage")));
@@ -56,6 +57,12 @@ QAEnvironment::accept_keyword(const KeywordName &, const PackageDatabaseEntry *
}
bool
+QAEnvironment::accept_license(const std::string &, const PackageDatabaseEntry * const) const
+{
+ return false;
+}
+
+bool
QAEnvironment::query_user_masks(const PackageDatabaseEntry &) const
{
return false;
@@ -66,4 +73,3 @@ QAEnvironment::query_user_unmasks(const PackageDatabaseEntry &) const
{
return false;
}
-
diff --git a/paludis/qa/environment.hh b/paludis/qa/environment.hh
index 77b29c7..1cea21c 100644
--- a/paludis/qa/environment.hh
+++ b/paludis/qa/environment.hh
@@ -45,6 +45,9 @@ namespace paludis
class QAEnvironment :
public Environment
{
+ private:
+ std::multimap<std::string, std::string> _mirrors;
+
public:
QAEnvironment(const FSEntry & base);
@@ -54,6 +57,8 @@ namespace paludis
virtual bool accept_keyword(const KeywordName &, const PackageDatabaseEntry * const) const;
+ virtual bool accept_license(const std::string &, const PackageDatabaseEntry * const) const;
+
virtual bool query_user_masks(const PackageDatabaseEntry &) const;
virtual bool query_user_unmasks(const PackageDatabaseEntry &) const;
@@ -63,6 +68,11 @@ namespace paludis
return "";
}
+ virtual std::string hook_dirs() const
+ {
+ return "";
+ }
+
virtual std::string paludis_command() const PALUDIS_ATTRIBUTE((noreturn))
{
throw InternalError(PALUDIS_HERE, "Cannot use paludis_command in a QA environment");
@@ -73,6 +83,20 @@ namespace paludis
{
return UseFlagNameCollection::Pointer(new UseFlagNameCollection);
}
+
+ virtual MirrorIterator begin_mirrors(const std::string & mirror) const
+ {
+ return _mirrors.end();
+ }
+
+ virtual MirrorIterator end_mirrors(const std::string & mirror) const
+ {
+ return _mirrors.end();
+ }
+
+ virtual void perform_hook (const Hook & hook) const
+ {
+ }
};
}
}
diff --git a/paludis/qa/files.m4 b/paludis/qa/files.m4
index 50c0cd5..6eea362 100644
--- a/paludis/qa/files.m4
+++ b/paludis/qa/files.m4
@@ -11,19 +11,19 @@ dnl on this file at present...
add(`changelog_check', `hh', `cc')
add(`check', `hh', `cc')
add(`check_result', `hh', `cc', `test')
-add(`create_metadata_check', `hh', `cc')
+dnl add(`create_metadata_check', `hh', `cc')
add(`defaults_check', `hh', `cc')
-add(`dep_any_check', `hh', `cc')
-add(`dep_flags_check', `hh', `cc')
-add(`dep_packages_check', `hh', `cc')
-add(`deps_exist_check', `hh', `cc')
-add(`deps_visible_check', `hh', `cc')
-add(`description_check', `hh', `cc')
+dnl add(`dep_any_check', `hh', `cc')
+dnl add(`dep_flags_check', `hh', `cc')
+dnl add(`dep_packages_check', `hh', `cc')
+dnl add(`deps_exist_check', `hh', `cc')
+dnl add(`deps_visible_check', `hh', `cc')
+dnl add(`description_check', `hh', `cc')
add(`digest_collisions_check', `hh', `cc')
add(`ebuild_check', `hh', `cc')
add(`ebuild_count', `hh', `cc')
add(`environment', `hh', `cc')
-add(`extract_check', `hh', `cc')
+dnl add(`extract_check', `hh', `cc')
add(`file_check', `hh', `cc')
add(`file_name_check', `hh', `cc')
add(`file_permissions_check', `hh', `cc', `test', `testscript')
@@ -31,20 +31,20 @@ add(`files_dir_size_check', `hh', `cc')
add(`glep_31_check', `hh', `cc', `test')
add(`has_ebuilds_check', `hh', `cc', `test', `testscript')
add(`has_misc_files_check', `hh', `cc', `test', `testscript')
-add(`homepage_check', `hh', `cc')
-add(`inherits_check', `hh', `cc')
-add(`iuse_check', `hh', `cc')
-add(`keywords_check', `hh', `cc')
-add(`license_check', `hh', `cc')
+dnl add(`homepage_check', `hh', `cc')
+dnl add(`inherits_check', `hh', `cc')
+dnl add(`iuse_check', `hh', `cc')
+dnl add(`keywords_check', `hh', `cc')
+dnl add(`license_check', `hh', `cc')
add(`message', `hh', `cc', `test')
-add(`metadata_check', `hh', `cc')
+dnl add(`metadata_check', `hh', `cc')
add(`package_dir_check', `hh', `cc')
add(`package_name_check', `hh', `cc', `test', `testscript')
-add(`parse_deps_check', `hh', `cc')
-add(`restrict_check', `hh', `cc')
-add(`src_uri_check', `hh', `cc')
-add(`pdepend_overlap_check', `hh', `cc')
+dnl add(`parse_deps_check', `hh', `cc')
+dnl add(`restrict_check', `hh', `cc')
+dnl add(`src_uri_check', `hh', `cc')
+dnl add(`pdepend_overlap_check', `hh', `cc')
add(`qa', `hh', `cc')
-add(`slot_check', `hh', `cc')
+dnl add(`slot_check', `hh', `cc')
add(`whitespace_check', `hh', `cc')