aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Richard Brown <rbrown@exherbo.org> 2007-01-04 23:37:48 +0000
committerAvatar Richard Brown <rbrown@exherbo.org> 2007-01-04 23:37:48 +0000
commit45c91b51680878a6137d885e551a9a64f3680c43 (patch)
tree038bc605e5df1aeda033229a840a50a267085f86
parente4dbfd075627bb1892a272c246f95827cf30d91b (diff)
downloadpaludis-45c91b51680878a6137d885e551a9a64f3680c43.tar.gz
paludis-45c91b51680878a6137d885e551a9a64f3680c43.tar.xz
Prepare DepList for rubyfication.
-rw-r--r--paludis/dep_list/dep_list.cc11
-rw-r--r--paludis/dep_list/dep_list.hh27
2 files changed, 28 insertions, 10 deletions
diff --git a/paludis/dep_list/dep_list.cc b/paludis/dep_list/dep_list.cc
index 6d2bedc..2d89597 100644
--- a/paludis/dep_list/dep_list.cc
+++ b/paludis/dep_list/dep_list.cc
@@ -443,6 +443,9 @@ DepList::AddVisitor::visit(const PackageDepAtom * const a)
case dl_fall_back_as_needed:
can_fall_back = true;
continue;
+
+ case dl_fall_back_last:
+ ;
}
throw InternalError(PALUDIS_HERE, "Bad fall_back value '" + stringify(d->_imp->opts.fall_back) + "'");
@@ -876,6 +879,9 @@ DepList::prefer_installed_over_uninstalled(const PackageDatabaseEntry & installe
case dl_target_set:
continue;
+
+ case dl_target_last:
+ ;
}
throw InternalError(PALUDIS_HERE, "Bad target_type value '" + stringify(_imp->opts.target_type) + "'");
@@ -911,8 +917,11 @@ DepList::prefer_installed_over_uninstalled(const PackageDatabaseEntry & installe
return false;
continue;
- case dl_reinstall_never:
+ case dl_reinstall_scm_never:
; /* nothing */
+
+ case dl_reinstall_scm_last:
+ ;
}
throw InternalError(PALUDIS_HERE, "Bad value for opts.reinstall_scm");
diff --git a/paludis/dep_list/dep_list.hh b/paludis/dep_list/dep_list.hh
index 55eb0a4..6816d95 100644
--- a/paludis/dep_list/dep_list.hh
+++ b/paludis/dep_list/dep_list.hh
@@ -43,7 +43,8 @@ namespace paludis
enum DepListTargetType
{
dl_target_package, ///\< A package, so force reinstalls.
- dl_target_set ///\< A set, so don't force reinstalls.
+ dl_target_set, ///\< A set, so don't force reinstalls.
+ dl_target_last
};
/**
@@ -55,7 +56,8 @@ namespace paludis
{
dl_reinstall_never, ///\< Never.
dl_reinstall_always, ///\< Always.
- dl_reinstall_if_use_changed ///\< If a USE flag has changed.
+ dl_reinstall_if_use_changed, ///\< If a USE flag has changed.
+ dl_reinstall_last
};
/**
@@ -67,7 +69,8 @@ namespace paludis
{
dl_fall_back_as_needed_except_targets,
dl_fall_back_as_needed,
- dl_fall_back_never
+ dl_fall_back_never,
+ dl_fall_back_last
};
/**
@@ -80,7 +83,8 @@ namespace paludis
dl_reinstall_scm_never,
dl_reinstall_scm_always,
dl_reinstall_scm_daily,
- dl_reinstall_scm_weekly
+ dl_reinstall_scm_weekly,
+ dl_reinstall_scm_last
};
/**
@@ -91,7 +95,8 @@ namespace paludis
enum DepListUpgradeOption
{
dl_upgrade_always, ///\< Always.
- dl_upgrade_as_needed ///\< Only as needed.
+ dl_upgrade_as_needed, ///\< Only as needed.
+ dl_upgrade_last
};
/**
@@ -102,7 +107,8 @@ namespace paludis
enum DepListNewSlotsOption
{
dl_new_slots_always,
- dl_new_slots_as_needed
+ dl_new_slots_as_needed,
+ dl_new_slots_last
};
/**
@@ -116,7 +122,8 @@ namespace paludis
dl_deps_pre, ///\< As a pre dependency
dl_deps_pre_or_post, ///\< As a pre dependency with fallback to post
dl_deps_post, ///\< As a post dependency
- dl_deps_try_post ///\< As an optional post dependency
+ dl_deps_try_post, ///\< As an optional post dependency
+ dl_deps_last
};
/**
@@ -127,7 +134,8 @@ namespace paludis
enum DepListCircularOption
{
dl_circular_error, ///\< As an error
- dl_circular_discard ///\< Discard them
+ dl_circular_discard, ///\< Discard them
+ dl_circular_last
};
/**
@@ -139,7 +147,8 @@ namespace paludis
{
dle_no_deps, ///\< Dependencies have yet to be added
dle_has_pre_deps, ///\< Predependencies have been added
- dle_has_all_deps ///\< All dependencies have been added
+ dle_has_all_deps, ///\< All dependencies have been added
+ dle_last
};
#include <paludis/dep_list/dep_list-sr.hh>