aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-01-17 20:34:04 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-01-17 20:34:04 +0000
commitbc67d7b709d16a0b0dd0618953d1102a192f566f (patch)
treeb29695d7f6c3e298c5ae2b3fe1291c75b2075440
parentcc6974f7ce860680c7b67e2687eeeeeeeaa6536c (diff)
downloadpaludis-bc67d7b709d16a0b0dd0618953d1102a192f566f.tar.gz
paludis-bc67d7b709d16a0b0dd0618953d1102a192f566f.tar.xz
Make install code cleaner with the new DepList RDEPEND options.
-rw-r--r--src/command_line.cc7
-rw-r--r--src/install.cc23
2 files changed, 11 insertions, 19 deletions
diff --git a/src/command_line.cc b/src/command_line.cc
index b45a970..131e15e 100644
--- a/src/command_line.cc
+++ b/src/command_line.cc
@@ -45,8 +45,11 @@ CommandLine::CommandLine() :
a_pretend(&install_args, "pretend", 'p', "Pretend only"),
dl_args(this, "DepList behaviour (use with caution)"),
- a_dl_rdepend_post(&dl_args, "dl-rdepend-post", '\0', "Treat RDEPEND like PDEPEND where necessary",
- paludis::args::EnumArg::EnumArgOptions("always", "Always")("never", "Never")("as-needed", "Only where needed to resolve circular dependencies"), "as-needed"),
+ a_dl_rdepend_post(&dl_args, "dl-rdepend-post", '\0', "Treat RDEPEND like PDEPEND",
+ paludis::args::EnumArg::EnumArgOptions("always", "Always")
+ ("never", "Never")
+ ("as-needed", "Only where needed to resolve circular dependencies (default)"),
+ "as-needed"),
a_dl_drop_self_circular(&dl_args, "dl-drop-self-circular", '\0', "Drop self-circular dependencies"),
a_dl_drop_circular(&dl_args, "dl-drop-circular", '\0', "Drop circular dependencies"),
a_dl_ignore_installed(&dl_args, "dl-ignore-installed", '\0', "Ignore installed packages"),
diff --git a/src/install.cc b/src/install.cc
index 8b737a0..77b54b5 100644
--- a/src/install.cc
+++ b/src/install.cc
@@ -136,35 +136,24 @@ do_install()
<< e.what() << ")" << endl;
cerr << endl;
-// dep_list.set_rdepend_post(true);
+ dep_list.set_drop_self_circular(true);
try
{
dep_list.add(targets);
- cerr << "Adding --dl-rdepend-post will resolve this." << endl << std::endl;
+ cerr << "Adding --dl-drop-self-circular will resolve this, but may omit some genuine"
+ << endl << "dependencies." << endl << endl;
}
catch (...)
{
- dep_list.set_drop_self_circular(true);
+ dep_list.set_drop_circular(true);
try
{
dep_list.add(targets);
- cerr << "Adding --dl-rdepend-post --dl-drop-self-circular "
- << "will resolve this, but may" << endl
- << "omit some genuine dependencies." << endl << std::endl;
+ cerr << "Adding --dl-drop-circular will resolve this, but may omit some genuine" << endl
+ << "dependencies." << endl << endl;
}
catch (...)
{
- dep_list.set_drop_circular(true);
- try
- {
- dep_list.add(targets);
- cerr << "Adding --dl-rdepend-post --dl-drop-circular "
- << "will resolve this, but may omit" << endl
- << "some genuine dependencies." << endl << std::endl;
- }
- catch (...)
- {
- }
}
}