From: David Kalnischkies Date: Thu, 14 Jul 2011 10:08:16 +0000 (+0200) Subject: * cmdline/apt-get.cc: X-Git-Tag: 0.9.0~85^2~2 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d4cfaed3d822b207f24ce11768ee14682a0c8f6b * cmdline/apt-get.cc: - add an --assume-no option for testing to say 'no' to everything --- diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 66ebd30b8..94e078cb3 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -135,6 +135,11 @@ bool YnPrompt(bool Default=true) c1out << _("Y") << endl; return true; } + else if (_config->FindB("APT::Get::Assume-No",false) == true) + { + c1out << _("N") << endl; + return false; + } char response[1024] = ""; cin.getline(response, sizeof(response)); @@ -3245,7 +3250,8 @@ int main(int argc,const char *argv[]) /*{{{*/ {'s',"dry-run","APT::Get::Simulate",0}, {'s',"no-act","APT::Get::Simulate",0}, {'y',"yes","APT::Get::Assume-Yes",0}, - {'y',"assume-yes","APT::Get::Assume-Yes",0}, + {'y',"assume-yes","APT::Get::Assume-Yes",0}, + {0,"assume-no","APT::Get::Assume-No",0}, {'f',"fix-broken","APT::Get::Fix-Broken",0}, {'u',"show-upgraded","APT::Get::Show-Upgraded",0}, {'m',"ignore-missing","APT::Get::Fix-Missing",0}, diff --git a/debian/changelog b/debian/changelog index 7b1ca1df0..5686e02fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,13 +9,15 @@ apt (0.8.16~exp3) UNRELEASEDexperimental; urgency=low converting (hopefully) everything to 'long long' (Closes: #632271) * ftparchive/writer.cc: - generate all checksums in one run over the file for Release + * cmdline/apt-get.cc: + - add an --assume-no option for testing to say 'no' to everything [ Michael Vogt ] * merge fixes from the debian/unstable upload * merge lp:~mvo/apt/sha512-template to get fixes for the sha1/md5 verifiation (closes: #632520) - -- David Kalnischkies Wed, 13 Jul 2011 23:22:14 +0200 + -- David Kalnischkies Thu, 14 Jul 2011 12:01:53 +0200 apt (0.8.16~exp2) experimental; urgency=low diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 11b53e5e7..23e682fd9 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -422,6 +422,11 @@ Configuration Item: APT::Get::Assume-Yes. + + Automatic "no" to all prompts. + Configuration Item: APT::Get::Assume-No. + + Show upgraded packages; Print out a list of all packages that are to be upgraded.