diff options
| -rw-r--r-- | src/clients/importare/command_line.cc | 10 | ||||
| -rw-r--r-- | src/clients/importare/importare.cc | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/clients/importare/command_line.cc b/src/clients/importare/command_line.cc index fdb9dc40f..8da5ac210 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 6cedb3fc4..d7e5a8ea8 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"); |