aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-23 12:38:37 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-23 12:38:37 +0100
commitefb4ba6242a6388dbe0a20ac66ba6ae041e49ca8 (patch)
treee0b3ca683654e9618f49d749b34e96108c0a60b1
parent958b935aa2c423b889cfde0104c41b392b9a1540 (diff)
downloadpaludis-efb4ba6242a6388dbe0a20ac66ba6ae041e49ca8.tar.gz
paludis-efb4ba6242a6388dbe0a20ac66ba6ae041e49ca8.tar.xz
Importare is deprecated
-rw-r--r--src/clients/importare/command_line.cc10
-rw-r--r--src/clients/importare/importare.cc3
2 files changed, 8 insertions, 5 deletions
diff --git a/src/clients/importare/command_line.cc b/src/clients/importare/command_line.cc
index fdb9dc4..8da5ac2 100644
--- a/src/clients/importare/command_line.cc
+++ b/src/clients/importare/command_line.cc
@@ -80,6 +80,8 @@ CommandLine::CommandLine() :
"Packages installed using importare will not be visible to broken ebuilds that illegally access the VDB. "
"This means that things like 'built_with_use' will not realise that the package is installed.");
+ add_note("Importare is deprecated. Use 'cave import' instead.");
+
add_example(
"importare --location img/ unpackaged/myapp 1.23",
"Install the contents of img/ (which could be produced, for example, using 'sudo make DESTDIR=img/ install' "
@@ -107,17 +109,15 @@ CommandLine::app_name() const
std::string
CommandLine::app_synopsis() const
{
- return "The Paludis unpackaged package installer";
+ return "The deprecated Paludis unpackaged package installer";
}
std::string
CommandLine::app_description() const
{
return
- "importare can be used to manage packages where no real package file is available. It "
- "treats the contents of a named directory as being the content of the package, and uses "
- "a dummy package name provided on the command line to do the install. Safe merge, unmerge, "
- "upgrade and replace support is provided, as is content tracking for installed files.";
+ "importare can be used to manage packages where no real package file is available. Importare is "
+ "deprecated; use 'cave import' instead.";
}
CommandLine::~CommandLine()
diff --git a/src/clients/importare/importare.cc b/src/clients/importare/importare.cc
index 6cedb3f..d7e5a8e 100644
--- a/src/clients/importare/importare.cc
+++ b/src/clients/importare/importare.cc
@@ -86,6 +86,9 @@ main(int argc, char *argv[])
Context context(std::string("In program ") + argv[0] + " " + options + ":");
+ Log::get_instance()->message("importare.deprecated", ll_warning, lc_context)
+ << "importare is deprecated. Use 'cave import' instead.";
+
try
{
CommandLine::get_instance()->run(argc, argv, "importare", "IMPORTARE_OPTIONS", "IMPORTARE_CMDLINE");