summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-21 07:20:07 +0100
committerMichael Vogt <mvo@debian.org>2014-01-21 07:20:07 +0100
commitf744c64c591cec9e5aa489a9af55e1ed6d1871d1 (patch)
treede1d27910d66062508b22c5a7b46c288d1b3fab9 /cmdline
parent7f316a3feab95370f1dd28c08c58bc3c140bf0a0 (diff)
parent1700c3cfb902f3f61fa4d9269523467fcceaaf58 (diff)
Merge remote-tracking branch 'upstream/debian/experimental-no-abi-break' into feature/source-deb822
Conflicts: test/integration/test-apt-sources-deb822
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt.cc41
1 files changed, 28 insertions, 13 deletions
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 4bcae0aba..61d5d938a 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -71,13 +71,16 @@ bool ShowHelp(CommandLine &CmdL)
_("Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
- "Commands: \n"
+ "Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+ "\n"
" install - install packages\n"
+ " remove - remove packages\n"
+ "\n"
" upgrade - upgrade the systems packages\n"
"\n"
" edit-sources - edit the source information file\n"
@@ -86,6 +89,15 @@ bool ShowHelp(CommandLine &CmdL)
return true;
}
+// figure out what kind of upgrade the user wants
+bool DoAptUpgrade(CommandLine &CmdL)
+{
+ if (_config->FindB("Apt::Cmd::Dist-Upgrade"))
+ return DoDistUpgrade(CmdL);
+ else
+ return DoUpgradeWithAllowNewPackages(CmdL);
+}
+
int main(int argc, const char *argv[]) /*{{{*/
{
CommandLine::Dispatch Cmds[] = {{"list",&List},
@@ -94,8 +106,9 @@ int main(int argc, const char *argv[]) /*{{{*/
// needs root
{"install",&DoInstall},
{"remove", &DoInstall},
+ {"purge", &DoInstall},
{"update",&DoUpdate},
- {"upgrade",&DoUpgradeWithAllowNewPackages},
+ {"upgrade",&DoAptUpgrade},
// misc
{"edit-sources",&EditSources},
// helper
@@ -105,17 +118,6 @@ int main(int argc, const char *argv[]) /*{{{*/
std::vector<CommandLine::Args> Args = getCommandArgs("apt", CommandLine::GetCommand(Cmds, argc, argv));
- if(!isatty(1))
- {
- std::cerr << std::endl
- << "WARNING WARNING "
- << argv[0]
- << " is *NOT* intended for scripts "
- << "use at your own peril^Wrisk"
- << std::endl
- << std::endl;
- }
-
InitOutput();
// Set up gettext support
@@ -141,6 +143,19 @@ int main(int argc, const char *argv[]) /*{{{*/
return 100;
}
+ if(!isatty(STDOUT_FILENO) &&
+ _config->FindB("Apt::Cmd::Disable-Script-Warning", false) == false)
+ {
+ std::cerr << std::endl
+ << "WARNING: " << argv[0] << " "
+ << "does not have a stable CLI interface yet. "
+ << "Use with caution in scripts."
+ << std::endl
+ << std::endl;
+ }
+ if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
+ _config->Set("quiet","1");
+
// See if the help should be shown
if (_config->FindB("help") == true ||
_config->FindB("version") == true ||