diff options
author | Michael Vogt <mvo@debian.org> | 2014-01-21 07:20:07 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-01-21 07:20:07 +0100 |
commit | f744c64c591cec9e5aa489a9af55e1ed6d1871d1 (patch) | |
tree | de1d27910d66062508b22c5a7b46c288d1b3fab9 /apt-private/private-cmndline.cc | |
parent | 7f316a3feab95370f1dd28c08c58bc3c140bf0a0 (diff) | |
parent | 1700c3cfb902f3f61fa4d9269523467fcceaaf58 (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 'apt-private/private-cmndline.cc')
-rw-r--r-- | apt-private/private-cmndline.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 28309af07..cbb40d42e 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -226,9 +226,15 @@ bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * const Cm { addArg(0,"installed","APT::Cmd::Installed",0); addArg(0,"upgradable","APT::Cmd::Upgradable",0); + addArg(0,"manual-installed","APT::Cmd::Manual-Installed",0); addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0); addArg('a', "all-versions", "APT::Cmd::All-Versions", 0); } + else if (CmdMatches("upgrade")) + { + // FIXME: find a better term + addArg(0,"dist","APT::Cmd::Dist-Upgrade", CommandLine::Boolean); + } else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd)) { // we have no (supported) command-name overlaps so far, so we call |