From 80e8d923ebc8d5f3f84eb3f922b28ca309c25026 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 26 Aug 2013 18:52:06 +0200 Subject: apt-private/private-cmndline.cc: fix typo: s/deselect-upgrade/dselect-upgrade/ --- apt-private/private-cmndline.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index aceb865d5..8902f07d5 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -114,7 +114,7 @@ bool addArgumentsAPTConfig(std::vector &Args, char const * co bool addArgumentsAPTGet(std::vector &Args, char const * const Cmd)/*{{{*/ { if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade", - "deselect-upgrade", "autoremove")) + "dselect-upgrade", "autoremove")) { addArg(0, "dpkg-progress", "DpkgPM::Progress", 0); addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0); -- cgit v1.2.3 From c8d49419be9ce10ade643370bf29891f76b5c339 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 27 Aug 2013 14:07:52 +0200 Subject: add new "apt-get upgrade --with-allow-new" option The --with-allow-new option maps to APT::Get::UpgradeAllowNew and will allow "apt-get upgrade" to install new packages (but not to delete existing packages) --- apt-private/private-cmndline.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index aceb865d5..c0b5a875f 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -163,6 +163,9 @@ bool addArgumentsAPTGet(std::vector &Args, char const * const addArg('s', "no-act", "APT::Get::Simulate", 0); } + if (CmdMatches("upgrade")) + addArg(0, "allow-new", "APT::Get::UpgradeAllowNew", CommandLine::Boolean); + // FIXME: move to the correct command(s) addArg('d',"download-only","APT::Get::Download-Only",0); addArg('y',"yes","APT::Get::Assume-Yes",0); -- cgit v1.2.3 From c678a0443518aa5e8f328f358fca7b35252df84e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Aug 2013 11:28:40 +0200 Subject: add man-page, improve option, use --with-new-pkgs as the flag --- apt-private/private-cmndline.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index c0b5a875f..152256806 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -125,7 +125,8 @@ bool addArgumentsAPTGet(std::vector &Args, char const * const addArg(0, "solver", "APT::Solver", CommandLine::HasArg); if (CmdMatches("upgrade")) { - addArg(0, "allow-new", "APT::Get::UpgradeAllowNew", 0); + addArg(0, "allow-new", "APT::Get::Upgrade-Allow-New", + CommandLine::Boolean); } } else if (CmdMatches("update")) @@ -163,9 +164,6 @@ bool addArgumentsAPTGet(std::vector &Args, char const * const addArg('s', "no-act", "APT::Get::Simulate", 0); } - if (CmdMatches("upgrade")) - addArg(0, "allow-new", "APT::Get::UpgradeAllowNew", CommandLine::Boolean); - // FIXME: move to the correct command(s) addArg('d',"download-only","APT::Get::Download-Only",0); addArg('y',"yes","APT::Get::Assume-Yes",0); -- cgit v1.2.3 From 2004d64720b396ae2dc9d2a7f6bf7859d6d7ee9b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Aug 2013 11:36:44 +0200 Subject: its --with-new-pkgs --- apt-private/private-cmndline.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 152256806..b30eeffb7 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -125,7 +125,7 @@ bool addArgumentsAPTGet(std::vector &Args, char const * const addArg(0, "solver", "APT::Solver", CommandLine::HasArg); if (CmdMatches("upgrade")) { - addArg(0, "allow-new", "APT::Get::Upgrade-Allow-New", + addArg(0, "new-pkgs", "APT::Get::Upgrade-Allow-New", CommandLine::Boolean); } } -- cgit v1.2.3 From 58c2833fed05dd044a4a937271fb6a8d639fa863 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 Sep 2013 17:41:01 +0200 Subject: Fix regression of "apt-cache unmet -i", thanks to Daniel Schepler (closes: #722324) --- apt-private/private-cmndline.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 8902f07d5..e8a21cb0c 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -62,8 +62,12 @@ bool addArgumentsAPTCache(std::vector &Args, char const * con { addArg(0, "all-names", "APT::Cache::AllNames", 0); } + else if (CmdMatches("unmet")) + { + addArg('i', "important", "APT::Cache::Important", 0); + } else if (CmdMatches("gencaches", "showsrc", "showpkg", "stats", "dump", - "dumpavail", "unmet", "showauto", "policy", "madison")) + "dumpavail", "showauto", "policy", "madison")) ; else return false; -- cgit v1.2.3 From 4fb66d8731045e6ad90ef70dff45bd28815714fc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 1 Oct 2013 11:30:56 +0200 Subject: rename "--dpkg-progress" to "--show-progress" and document it in apt-get.8 --- apt-private/private-cmndline.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 8902f07d5..eedabe20c 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -116,7 +116,7 @@ bool addArgumentsAPTGet(std::vector &Args, char const * const if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade", "dselect-upgrade", "autoremove")) { - addArg(0, "dpkg-progress", "DpkgPM::Progress", 0); + addArg(0, "show-progress", "DpkgPM::Progress", 0); addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0); addArg(0, "purge", "APT::Get::Purge", 0); addArg('V',"verbose-versions","APT::Get::Show-Versions",0); -- cgit v1.2.3 From e1dc051a11c2860abebf626df0470a5feb03677a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 26 Nov 2013 08:17:29 +0100 Subject: add APT::Cmd::List-Include-Summary --- apt-private/private-cmndline.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 8ba6629a8..b73227924 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -223,6 +223,7 @@ bool addArgumentsAPT(std::vector &Args, char const * const Cm addArg(0,"installed","APT::Cmd::Installed",0); addArg(0,"upgradable","APT::Cmd::Upgradable",0); addArg('a', "all-versions", "APT::Cmd::AllVersions", 0); + addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0); } else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd)) { -- cgit v1.2.3 From c1a61d1ca91e0a0a79b8c1be3fe04bcfa12cf0dc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 26 Nov 2013 09:04:48 +0100 Subject: rename APT::Cmd::AllVersions -> APT::Cmd::All-Versions, APT::Cmd::UseRegexp -> APT::Cmd::Use-Regexp --- apt-private/private-cmndline.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 8ba6629a8..35d61f318 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -222,7 +222,7 @@ bool addArgumentsAPT(std::vector &Args, char const * const Cm { addArg(0,"installed","APT::Cmd::Installed",0); addArg(0,"upgradable","APT::Cmd::Upgradable",0); - addArg('a', "all-versions", "APT::Cmd::AllVersions", 0); + addArg('a', "all-versions", "APT::Cmd::All-Versions", 0); } else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd)) { -- cgit v1.2.3 From e4e5d47b0e66ae7bedafbdbb685114c404381204 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 28 Nov 2013 16:50:20 +0100 Subject: fix "apt-get --purge build-dep" (closes: #720597) --- apt-private/private-cmndline.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 8ba6629a8..b6f257bcb 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -149,6 +149,7 @@ bool addArgumentsAPTGet(std::vector &Args, char const * const else if (CmdMatches("build-dep")) { addArg('a', "host-architecture", "APT::Get::Host-Architecture", CommandLine::HasArg); + addArg(0, "purge", "APT::Get::Purge", 0); addArg(0, "solver", "APT::Solver", CommandLine::HasArg); } else if (CmdMatches("clean", "autoclean", "check", "download", "changelog") || -- cgit v1.2.3 From c872ac503156caff9d0e33306c4121dd667a6567 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 28 Nov 2013 19:45:44 +0100 Subject: add "-f" option to "build-dep" as sbuild is using it to fix regression with cross-building (LP: #1255806) --- apt-private/private-cmndline.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index b6f257bcb..718a7ce6a 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -151,6 +151,9 @@ bool addArgumentsAPTGet(std::vector &Args, char const * const addArg('a', "host-architecture", "APT::Get::Host-Architecture", CommandLine::HasArg); addArg(0, "purge", "APT::Get::Purge", 0); addArg(0, "solver", "APT::Solver", CommandLine::HasArg); + // this has no effect *but* sbuild is using it (see LP: #1255806) + // once sbuild is fixed, this option can be removed + addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0); } else if (CmdMatches("clean", "autoclean", "check", "download", "changelog") || CmdMatches("markauto", "unmarkauto")) // deprecated commands -- cgit v1.2.3 From 3bdf7da5b40636376699aa8a976aae1b279ef356 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Jan 2014 16:45:11 +0100 Subject: add --manual-installed commandline switch --- apt-private/private-cmndline.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 28309af07..d6d7bca64 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -226,6 +226,7 @@ bool addArgumentsAPT(std::vector &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); } -- cgit v1.2.3 From 82e7f817a434e29df9ec6fbf19acfd8e7cd890e5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 17 Jan 2014 07:48:43 +0100 Subject: add apt upgrade --dist --- apt-private/private-cmndline.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index d6d7bca64..cbb40d42e 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -230,6 +230,11 @@ bool addArgumentsAPT(std::vector &Args, char const * const Cm 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 -- cgit v1.2.3 From 06293aa79b46efdec96910b2f678ce1cbdecc86d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 23 Jan 2014 07:52:23 +0100 Subject: Show only the candidate with "apt show" Display only the candidate version with "apt show pkg" but show a notice that there is more to see. --- apt-private/private-cmndline.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index cbb40d42e..2b6c710d6 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -235,6 +235,10 @@ bool addArgumentsAPT(std::vector &Args, char const * const Cm // FIXME: find a better term addArg(0,"dist","APT::Cmd::Dist-Upgrade", CommandLine::Boolean); } + else if (CmdMatches("show")) + { + addArg('a', "all-versions", "APT::Cache::AllVersions", 0); + } else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd)) { // we have no (supported) command-name overlaps so far, so we call -- cgit v1.2.3 From 59e81cec3e2277e367f14f113168421909c42035 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Jan 2014 20:33:02 +0100 Subject: add "apt full-upgrade" and tweak "apt upgrade" There is a new "apt full-upgrade" that performs a apt-get dist-upgrade. "apt dist-upgrade" is still supported as a alias. The "apt upgrade" code is changed so that it mirrors the behavior of "apt-get upgrade --with-new-pkgs" and also honors "apt uprade --no-new-pkgs". --- apt-private/private-cmndline.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'apt-private/private-cmndline.cc') diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index cbb40d42e..d6d7bca64 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -230,11 +230,6 @@ bool addArgumentsAPT(std::vector &Args, char const * const Cm 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 -- cgit v1.2.3