summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hartwig <mandyke@gmail.com>2012-03-17 19:09:23 +0800
committerDaniel Hartwig <mandyke@gmail.com>2012-03-17 19:09:23 +0800
commitabcb07c389d64108201e1e36c1686a57929f7a2b (patch)
tree817486d18859ee1403ea61b4fa0e5d95619762ca
parentfd28ea8c2af0786d3a426d06ea3527aa48de96ac (diff)
downloadaptitude-abcb07c389d64108201e1e36c1686a57929f7a2b.tar.gz
Use '~r' as short form of '?architecture'
-rw-r--r--doc/en/aptitude.xml4
-rw-r--r--src/generic/apt/matching/parse.cc2
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/en/aptitude.xml b/doc/en/aptitude.xml
index 96a8ad63..85231d8a 100644
--- a/doc/en/aptitude.xml
+++ b/doc/en/aptitude.xml
@@ -5563,7 +5563,7 @@ e: Examine !: Apply .: Next ,: Previous</screen>
<entry>
<literal>&Sarchitecture;(<replaceable>architecture</replaceable>)</literal>
</entry>
- <entry/>
+ <entry>~r<replaceable>architecture</replaceable></entry>
<entry>
Select packages for the given architecture (such as
<quote><literal>amd64</literal></quote>, or
@@ -6198,7 +6198,7 @@ e: Examine !: Apply .: Next ,: Previous</screen>
</varlistentry>
<varlistentry id='searchArchitecture'>
- <term><literal>?architecture(<replaceable>architecture</replaceable>)</literal></term>
+ <term><literal>?architecture(<replaceable>architecture</replaceable>)</literal>, <literal>~r<replaceable>architecture</replaceable></literal></term>
<listitem>
<para>
diff --git a/src/generic/apt/matching/parse.cc b/src/generic/apt/matching/parse.cc
index b4d80c4c..3257a642 100644
--- a/src/generic/apt/matching/parse.cc
+++ b/src/generic/apt/matching/parse.cc
@@ -1336,6 +1336,8 @@ ref_ptr<pattern> parse_atom(string::const_iterator &start,
return pattern::make_origin(substr);
case 'p':
return pattern::make_priority(parse_priority(substr));
+ case 'r':
+ return pattern::make_architecture(substr);
case 's':
return pattern::make_section(substr);
case 't':