aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-10-27 16:06:09 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-10-27 16:06:09 +0000
commit714c2311cf2952919189833f42ce18bff8a9cefd (patch)
treeb05d093c3aae33d74440d35c7df4ded908c4216f
parent7e0051297d6ae82607edb1279c38b26a74d500de (diff)
downloadpaludis-714c2311cf2952919189833f42ce18bff8a9cefd.tar.gz
paludis-714c2311cf2952919189833f42ce18bff8a9cefd.tar.xz
Unbreak --dl-deps-default.
-rw-r--r--NEWS2
-rw-r--r--paludis/args/dep_list_args_group.cc23
2 files changed, 17 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index c4096fe..7c00d15 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ trunk/:
* More verbose paludis --info output.
+ * Bug fixes: --dl-deps-default works again.
+
0.26.0_alpha2:
* STILL BROKEN, wait for 0.26.0 if you use these: CRAN, Ruby bindings for
dep specs.
diff --git a/paludis/args/dep_list_args_group.cc b/paludis/args/dep_list_args_group.cc
index a18ace3..b559c4b 100644
--- a/paludis/args/dep_list_args_group.cc
+++ b/paludis/args/dep_list_args_group.cc
@@ -277,14 +277,21 @@ DepListArgsGroup::populate_dep_list_options(const Environment * env, DepListOpti
options.uninstalled_deps_suggested = x;
}
- options.installed_deps_pre = enum_arg_to_dep_list_deps_option(dl_installed_deps_pre);
- options.installed_deps_runtime = enum_arg_to_dep_list_deps_option(dl_installed_deps_runtime);
- options.installed_deps_post = enum_arg_to_dep_list_deps_option(dl_installed_deps_post);
-
- options.uninstalled_deps_pre = enum_arg_to_dep_list_deps_option(dl_uninstalled_deps_pre);
- options.uninstalled_deps_runtime = enum_arg_to_dep_list_deps_option(dl_uninstalled_deps_runtime);
- options.uninstalled_deps_post = enum_arg_to_dep_list_deps_option(dl_uninstalled_deps_post);
- options.uninstalled_deps_suggested = enum_arg_to_dep_list_deps_option(dl_uninstalled_deps_suggested);
+ if (dl_installed_deps_pre.specified() || ! dl_deps_default.specified())
+ options.installed_deps_pre = enum_arg_to_dep_list_deps_option(dl_installed_deps_pre);
+ if (dl_installed_deps_runtime.specified() || ! dl_deps_default.specified())
+ options.installed_deps_runtime = enum_arg_to_dep_list_deps_option(dl_installed_deps_runtime);
+ if (dl_installed_deps_post.specified() || ! dl_deps_default.specified())
+ options.installed_deps_post = enum_arg_to_dep_list_deps_option(dl_installed_deps_post);
+
+ if (dl_uninstalled_deps_pre.specified() || ! dl_deps_default.specified())
+ options.uninstalled_deps_pre = enum_arg_to_dep_list_deps_option(dl_uninstalled_deps_pre);
+ if (dl_uninstalled_deps_runtime.specified() || ! dl_deps_default.specified())
+ options.uninstalled_deps_runtime = enum_arg_to_dep_list_deps_option(dl_uninstalled_deps_runtime);
+ if (dl_uninstalled_deps_post.specified() || ! dl_deps_default.specified())
+ options.uninstalled_deps_post = enum_arg_to_dep_list_deps_option(dl_uninstalled_deps_post);
+ if (dl_uninstalled_deps_suggested.specified() || ! dl_deps_default.specified())
+ options.uninstalled_deps_suggested = enum_arg_to_dep_list_deps_option(dl_uninstalled_deps_suggested);
}
void