diff options
| author | Michael Vogt <mvo@debian.org> | 2013-10-08 19:59:04 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-10-08 19:59:04 +0200 |
| commit | 649d3c5b7df830a67ad946921233da349c13a826 (patch) | |
| tree | 9ea0c7a4eade1e0fc9f27499888fe3ab801a3db6 | |
| parent | 15847d263c371cadcb8664021b8eb2444dd70998 (diff) | |
| parent | dbf8fc0419831c83e83165de8c434782165aa400 (diff) | |
Merge remote-tracking branch 'mvo/feature/upgrade-with-new' into debian/sid
| -rw-r--r-- | apt-private/private-cmndline.cc | 3 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 12 |
3 files changed, 15 insertions, 2 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 5124ac157..8ba6629a8 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -129,7 +129,8 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const addArg(0, "solver", "APT::Solver", CommandLine::HasArg); if (CmdMatches("upgrade")) { - addArg(0, "allow-new", "APT::Get::UpgradeAllowNew", 0); + addArg(0, "new-pkgs", "APT::Get::Upgrade-Allow-New", + CommandLine::Boolean); } } else if (CmdMatches("update")) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 630a9489b..e5e22e166 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1598,7 +1598,7 @@ void SigWinch(int) /*}}}*/ bool DoUpgrade(CommandLine &CmdL) /*{{{*/ { - if (_config->FindB("APT::Get::UpgradeAllowNew", false) == true) + if (_config->FindB("APT::Get::Upgrade-Allow-New", false) == true) return DoUpgradeWithAllowNewPackages(CmdL); else return DoUpgradeNoNewPackages(CmdL); diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 18a559c0b..4c050ec03 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -389,6 +389,18 @@ Configuration Item: <literal>APT::Ignore-Hold</literal>.</para></listitem> </varlistentry> + <varlistentry><term><option>--with-new-pkgs</option></term> + <listitem><para>Allow installing new packages when used in + conjunction with <literal>upgrade</literal>. This is useful if + the update of a installed package requires new dependencies to be + installed. Instead of holding the package back <literal>upgrade</literal> + will upgrade the package and install the new dependencies. Note that + <literal>upgrade</literal> with this option will never remove packages, + only allow adding new ones. + Configuration Item: <literal>APT::Get::Upgrade-Allow-New</literal>. + </para></listitem> + </varlistentry> + <varlistentry><term><option>--no-upgrade</option></term> <listitem><para>Do not upgrade packages; when used in conjunction with <literal>install</literal>, <literal>no-upgrade</literal> will prevent packages on the command line |