Accept --upgradeable as synonym for --upgradable

It's a tiny diff, so why not? But no need to document it.

Closes: #787846

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index cfdc13259837c92b03f4a301d3e1a79e9eb50819..fa84168242680d30d7270d4e8465bcbb2c8d7b4f 100644 (file)
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -242,6 +242,7 @@ static bool addArgumentsAPT(std::vector<CommandLine::Args> &Args, char const * c
    if (CmdMatches("list"))
    {
       addArg(0,"installed","APT::Cmd::Installed",0);
+      addArg(0,"upgradeable","APT::Cmd::Upgradable",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);

diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index 29bf96751832bb997d84a3aa934476fa7cda4eeb..e00b6417af2dda826d349170462c210327ed1a70 100644 (file)
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -44,7 +44,8 @@
      display a list of packages. It supports shell pattern for matching 
      package names and the following options:
        <option>--installed</option>, 
-       <option>--upgradable</option>, 
+       <option>--upgradable</option>,
+       <option>--upgradeable</option>,
        <option>--all-versions</option>
      are supported.
      </para></listitem>

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 98c2b66b592c899288fc0df0ff53ca1b864c7d37..509b5da344a88e82a0394edd1272dd3c762fa49a 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -531,7 +531,8 @@ msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
 "<option>--installed</option>, <option>--upgradable</option>, "
-"<option>--all-versions</option> are supported."
+"<option>--upgradeable</option>, <option>--all-versions</option> are "
+"supported."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

diff --git a/doc/po/de.po b/doc/po/de.po
index 4eb458d17d213e286757fa65c8da2cd47a874155..bc8d8c899baad14f03223ca525be232a5fa2b3ad 100644 (file)
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -662,13 +662,13 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 "<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
 "unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
 "folgenden Optionen werden unterstützt: <option>--installed</option>, "
-"<option>--upgradable</option>, <option>--all-versions</option>."
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-versions</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:54

diff --git a/doc/po/es.po b/doc/po/es.po
index 590ae4aeb78142c4d33f7f7ebc5b9a30084955aa..5cba392d4848f21fee8abd1a90b957fa9f78b803 100644 (file)
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -742,7 +742,7 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 

diff --git a/doc/po/fr.po b/doc/po/fr.po
index 85869a2b7cedab5be991b17614f17c2c85973c0c..66f5e39c3080902dcdb1c6ec2d75e6ba3eb83275 100644 (file)
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -658,7 +658,7 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 "La commande <literal>list</literal> est utilisée pour afficher une liste de "

diff --git a/doc/po/it.po b/doc/po/it.po
index 28e97f14b5470e58de9487edacda98556f85a13b..21fbebd93d3191a219b5b966cd5d6b1aaff04e75 100644 (file)
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -710,13 +710,13 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 "<literal>list</literal> viene usato per visualizzare un elenco di pacchetti. "
 "Permette l'uso dei modelli di shell per la corrispondenza con nomi di "
 "pacchetto e sono gestite le seguenti opzioni: <option>--installed</option>, "
-"<option>--upgradable</option>, <option>--all-versions</option>."
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-versions</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml:54

diff --git a/doc/po/ja.po b/doc/po/ja.po
index 3e0712125d84ae8f03127b6919486b08abf8fb5c..ba72f0d027b85b7b55445d77180b3b3e092f67ed 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -704,12 +704,12 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 "パッケージ一覧を表示するには <literal>list</literal> を使います。パッケージ名"
 "のマッチングにシェルパターン、そしてオプション <option>--installed</"
-"option>、 <option>--upgradable</option>、 <option>--all-versions</option> を"
+"option>、 <option>--upgradable</option>, <option>--upgradeable</option>、 <option>--all-versions</option> を"
 "サポートしています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

diff --git a/doc/po/pl.po b/doc/po/pl.po
index 481d85af6ae160dbb27015e34ade5247b8e4cab9..8081be57bd7e966c6d3136f9e8d93276f079db2c 100644 (file)
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -700,7 +700,7 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 3aefcc2a91b720b7b9237fa694f5ce2777eb1503..702cae479a653007e517aad04dbc79efe9d9666d 100644 (file)
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -707,7 +707,7 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
 "<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "

diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 88b479e7512b73cdfb007cf8d178ecc285d963c2..5f03f7dac0aed4369b3ac46ffacb85ad8f7fd6b9 100644 (file)
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -523,7 +523,7 @@ msgstr ""
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
+"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""