diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-07-14 12:08:16 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-07-14 12:08:16 +0200 |
| commit | d4cfaed3d822b207f24ce11768ee14682a0c8f6b (patch) | |
| tree | 21c6ecc40a9bde609db97bb99cf0ec3c48f5b97d | |
| parent | 2dcf7b8f9b9e037901339ddef7d94a6a2bab90db (diff) | |
* cmdline/apt-get.cc:
- add an --assume-no option for testing to say 'no' to everything
| -rw-r--r-- | cmdline/apt-get.cc | 8 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 5 |
3 files changed, 15 insertions, 2 deletions
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 <kalnischkies@gmail.com> Wed, 13 Jul 2011 23:22:14 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> 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: <literal>APT::Get::Assume-Yes</literal>.</para></listitem> </varlistentry> + <varlistentry><term><option>--assume-no</option></term> + <listitem><para>Automatic "no" to all prompts. + Configuration Item: <literal>APT::Get::Assume-No</literal>.</para></listitem> + </varlistentry> + <varlistentry><term><option>-u</option></term><term><option>--show-upgraded</option></term> <listitem><para>Show upgraded packages; Print out a list of all packages that are to be upgraded. |