diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 16:17:08 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 16:17:08 +0200 |
| commit | 0f3150e7040f45565b459a1390606bc2f714f6a8 (patch) | |
| tree | 200b65a080c246b09e6bcdcd81ea82c824272600 /apt-private | |
| parent | 314b47542c57d0a12c55dd1dd334cf233a33fcfb (diff) | |
| parent | 4694e07d450baa13fa04482752ca369a5797c640 (diff) | |
Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid
Conflicts:
apt-pkg/deb/dpkgpm.cc
Diffstat (limited to 'apt-private')
| -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); |