aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-08 17:23:23 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-08 17:23:23 +0000
commit3550e6b2d54e7cf4f3ead142eb754c2d14d252ea (patch)
tree7418af36f90f944abd4f03cb044600d2db878170
parent2bd8fc4a7c8c53ad828c7fe25010719392c13328 (diff)
downloadpaludis-3550e6b2d54e7cf4f3ead142eb754c2d14d252ea.tar.gz
paludis-3550e6b2d54e7cf4f3ead142eb754c2d14d252ea.tar.xz
New defaults: --debug-build split, --dl-blocks accumulate, --dl-override-masks tilde-keyword license (and use 'none' to ignore defaults), --show-reasons summary, --show-use-descriptions changed, --show-package-descriptions new, --dl-downgrade warning
-rw-r--r--NEWS5
-rw-r--r--paludis/args/debug_build_arg.cc2
-rw-r--r--paludis/args/dep_list_args_group.cc28
-rw-r--r--paludis/args/install_args_group.cc6
4 files changed, 29 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index b8fe26f..67879aa 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,11 @@ trunk/:
* paludis, reconcilio, importare --compact, --show-package-descriptions.
+ * New defaults: --debug-build split, --dl-blocks
+ accumulate, --dl-override-masks tilde-keyword license (and use 'none' to
+ ignore defaults), --show-reasons summary, --show-use-descriptions changed,
+ --show-package-descriptions new, --dl-downgrade warning
+
0.26.0_alpha3:
* STILL BROKEN, wait for 0.26.0 if you use these: CRAN, Ruby bindings for
dep specs.
diff --git a/paludis/args/debug_build_arg.cc b/paludis/args/debug_build_arg.cc
index be9372d..57a7ee9 100644
--- a/paludis/args/debug_build_arg.cc
+++ b/paludis/args/debug_build_arg.cc
@@ -30,7 +30,7 @@ DebugBuildArg::DebugBuildArg(ArgsGroup * const grp, const std::string & ln,
("none", "Discard debug information")
("split", "Split debug information")
("internal", "Keep debug information"),
- "none")
+ "split")
{
}
diff --git a/paludis/args/dep_list_args_group.cc b/paludis/args/dep_list_args_group.cc
index b559c4b..8d74c17 100644
--- a/paludis/args/dep_list_args_group.cc
+++ b/paludis/args/dep_list_args_group.cc
@@ -89,7 +89,7 @@ DepListArgsGroup::DepListArgsGroup(ArgsHandler * h) :
("as-needed", "As needed")
("warning", "As needed, but warn when doing so")
("error", "Downgrades should be treated as errors"),
- "as-needed"),
+ "warning"),
dl_deps_default(this, "dl-deps-default", '\0',
"Override default behaviour for all dependency classes",
@@ -134,10 +134,11 @@ DepListArgsGroup::DepListArgsGroup(ArgsHandler * h) :
("accumulate", "Accumulate and show in the dependency list")
("error", "Error straight away")
("discard", "Discard (dangerous)"),
- "error"),
+ "accumulate"),
dl_override_masks(this, "dl-override-masks", '\0',
- "Zero or more mask kinds that can be overridden as necessary",
+ "Zero or more mask kinds that can be overridden as necessary (default: tilde-keyword and license)",
args::StringSetArg::StringSetArgOptions
+ ("none", "None (overrides defaults, not user selections)")
("tilde-keyword", "Keyword masks where accepting ~ would work")
("unkeyworded", "Keyword masks where a package is unkeyworded")
("repository", "Repository masks")
@@ -160,6 +161,8 @@ DepListArgsGroup::~DepListArgsGroup()
void
DepListArgsGroup::populate_dep_list_options(const Environment * env, DepListOptions & options) const
{
+ using namespace tr1::placeholders;
+
if (dl_reinstall.argument() == "never")
options.reinstall = dl_reinstall_never;
else if (dl_reinstall.argument() == "always")
@@ -228,16 +231,21 @@ DepListArgsGroup::populate_dep_list_options(const Environment * env, DepListOpti
else
throw args::DoHelp("bad value for --dl-blocks");
+ if (! options.override_masks)
+ options.override_masks.reset(new DepListOverrideMasksFunctions);
+ options.override_masks->push_back(tr1::bind(&override_tilde_keywords, env, _1, _2));
+ options.override_masks->push_back(tr1::bind(&override_license, _2));
+
if (dl_override_masks.specified())
{
for (args::StringSetArg::ConstIterator a(dl_override_masks.begin_args()),
a_end(dl_override_masks.end_args()) ; a != a_end ; ++a)
- {
- if (! options.override_masks)
+ if (*a == "none")
options.override_masks.reset(new DepListOverrideMasksFunctions);
- using namespace tr1::placeholders;
-
+ for (args::StringSetArg::ConstIterator a(dl_override_masks.begin_args()),
+ a_end(dl_override_masks.end_args()) ; a != a_end ; ++a)
+ {
if (*a == "tilde-keyword")
options.override_masks->push_back(tr1::bind(&override_tilde_keywords, env, _1, _2));
else if (*a == "unkeyworded")
@@ -248,9 +256,13 @@ DepListArgsGroup::populate_dep_list_options(const Environment * env, DepListOpti
options.override_masks->push_back(tr1::bind(&override_license, _2));
else if (*a == "profile")
{
- Log::get_instance()->message(ll_warning, lc_no_context, "--dl-override-masks profile is deprecated, use --dl-override-masks repository");
+ Log::get_instance()->message(ll_warning, lc_no_context) <<
+ "--dl-override-masks profile is deprecated, use --dl-override-masks repository";
options.override_masks->push_back(tr1::bind(&override_repository_masks, _2));
}
+ else if (*a == "none")
+ {
+ }
else
throw args::DoHelp("bad value for --dl-override-masks");
}
diff --git a/paludis/args/install_args_group.cc b/paludis/args/install_args_group.cc
index 4f97b92..4147c41 100644
--- a/paludis/args/install_args_group.cc
+++ b/paludis/args/install_args_group.cc
@@ -45,20 +45,20 @@ InstallArgsGroup::InstallArgsGroup(ArgsHandler * h, const std::string & our_name
("none", "Don't show any information")
("summary", "Show a summary")
("full", "Show full output (can be very verbose)"),
- "none"),
+ "summary"),
a_show_use_descriptions(this, "show-use-descriptions", '\0', "Show descriptions of USE flags",
args::EnumArg::EnumArgOptions
("none", "Don't show any descriptions")
("new", "Show for new use flags")
("changed", "Show for new and changed flags")
("all", "Show for all flags"),
- "none"),
+ "changed"),
a_show_package_descriptions(this, "show-package-descriptions", '\0', "Show package descriptions",
args::EnumArg::EnumArgOptions
("none", "Don't show any descriptions")
("new", "Show descriptions for new packages")
("all", "Show descriptions for all packages"),
- "none"),
+ "new"),
a_continue_on_failure(this, "continue-on-failure", '\0', "Whether to continue after a fetch or install error",
args::EnumArg::EnumArgOptions
("if-fetch-only", "If fetching only")