aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-07-24 22:29:28 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-07-24 22:29:28 +0000
commit94f91d3b2914dba2b8fe59d7ec6fda61716bdeaa (patch)
treefe984712e74599916d276b825f42411c21357a4c
parent634cca14ddefdb1efecc675ad76ead9a334dc5bb (diff)
downloadpaludis-94f91d3b2914dba2b8fe59d7ec6fda61716bdeaa.tar.gz
paludis-94f91d3b2914dba2b8fe59d7ec6fda61716bdeaa.tar.xz
Accept, with a warning, --dl-override-masks profile as a synonym for --dl-override-masks repository.
-rw-r--r--src/clients/paludis/command_line.cc2
-rw-r--r--src/clients/paludis/install.cc5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/clients/paludis/command_line.cc b/src/clients/paludis/command_line.cc
index afb3cda..7f57259 100644
--- a/src/clients/paludis/command_line.cc
+++ b/src/clients/paludis/command_line.cc
@@ -203,8 +203,8 @@ CommandLine::CommandLine() :
args::StringSetArg::StringSetArgOptions
("tilde-keyword", "Keyword masks where accepting ~ would work")
("unkeyworded", "Keyword masks where a package is unkeyworded")
- ("profile", "Profile masks")
("repository", "Repository masks")
+ ("profile", "Deprecated synonym for repository")
("license", "License masks")),
dl_fall_back(&dl_args, "dl-fall-back", '\0', "When to fall back to installed packages",
diff --git a/src/clients/paludis/install.cc b/src/clients/paludis/install.cc
index 14fe000..bbcfa80 100644
--- a/src/clients/paludis/install.cc
+++ b/src/clients/paludis/install.cc
@@ -454,6 +454,11 @@ do_install(tr1::shared_ptr<Environment> env)
options.override_masks->push_back(tr1::bind(&override_repository_masks, _2));
else if (*a == "license")
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");
+ options.override_masks->push_back(tr1::bind(&override_repository_masks, _2));
+ }
else
throw args::DoHelp("bad value for --dl-override-masks");
}