diff options
author | Michael Vogt <mvo@ubuntu.com> | 2015-04-08 12:24:50 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2015-04-08 12:24:50 +0200 |
commit | 460f0f95b22c36ddc5f184cef33c54a482b5f112 (patch) | |
tree | 324f78bd2fdddd6131301129d67fad5e9bf36871 /apt-private/private-cmndline.cc | |
parent | 0c235e5d6658bebe3daab6c708d112b3794fd809 (diff) | |
parent | d5cf8851753dde4f45bfd3b48fcdf34247a8752a (diff) |
Merge remote-tracking branch 'origin/debian/jessie' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
Diffstat (limited to 'apt-private/private-cmndline.cc')
-rw-r--r-- | apt-private/private-cmndline.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 0b5ba5b4f..c0f631a08 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -165,7 +165,7 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const addArg(0, "color", "APT::Moo::Color", 0); if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade", - "deselect-upgrade", "autoremove", "clean", "autoclean", "check", + "dselect-upgrade", "autoremove", "clean", "autoclean", "check", "build-dep", "full-upgrade", "source")) { addArg('s', "simulate", "APT::Get::Simulate", 0); |