Explorar o código

dpkg-architecture: Clarify that -a, -t, -e and -i work with the host system

Stating that these handle the “current” architecture makes no sense, and
it's not more clear. Just say clearly what they work with.
Guillem Jover %!s(int64=12) %!d(string=hai) anos
pai
achega
9c81361552
Modificáronse 3 ficheiros con 18 adicións e 16 borrados
  1. 1 0
      debian/changelog
  2. 13 12
      man/dpkg-architecture.1
  3. 4 4
      scripts/dpkg-architecture.pl

+ 1 - 0
debian/changelog

@@ -14,6 +14,7 @@ dpkg (1.17.14) UNRELEASED; urgency=low
     - Add support for target system information via the new DEB_TARGET_ family
       of variables, and new -A and -T options to override defaulting to the
       host system.
+    - Clarify that -a, -t, -e and -i work with the host system.
 
   [ Raphaël Hertzog ]
   * Explain better in deb-triggers(5) why interest/activate-noawait should be

+ 13 - 12
man/dpkg-architecture.1

@@ -51,16 +51,18 @@ Print the environment variables, one each line, in the format
 \fIVARIABLE=value\fP. This is the default action.
 .TP
 .BI \-e debian-architecture
-Check for equality of architecture (since dpkg 1.13.13). By default
-\fIdebian-architecture\fP is compared against the current Debian architecture,
-being the host. This action will not expand the architecture wildcards.
+Check for equality of architecture (since dpkg 1.13.13).
+It compares the current or specified Debian host architecture against
+\fIdebian-architecture\fP, to check if they are equal.
+This action will not expand the architecture wildcards.
 Command finishes with an exit status of 0 if matched, 1 if not matched.
 
 .TP
 .BI \-i architecture-wildcard
-Check for identity of architecture by expanding \fIarchitecture-wildcard\fP
-as an architecture wildcard and comparing against the current Debian
-architecture (since dpkg 1.13.13).
+Check for identity of architecture (since dpkg 1.13.13).
+It compares the current or specified Debian host architecture against
+\fIarchitecture-wildcard\fP after having expanded it as an architecture
+wildcard, to check if they match.
 Command finishes with an exit status of 0 if matched, 1 if not matched.
 .TP
 .BI \-q variable-name
@@ -89,10 +91,10 @@ Show the version and exit.
 .SH OPTIONS
 .TP
 .BI \-a debian-architecture
-Set the Debian architecture.
+Set the host Debian architecture.
 .TP
 .BI \-t gnu-system-type
-Set the GNU system type.
+Set the host GNU system type.
 .TP
 .BI \-A debian-architecture
 Set the target Debian architecture. This is only needed when building a
@@ -217,15 +219,14 @@ CC=i386\-gnu\-gcc dpkg\-architecture \-c debian/rules build
 .IP
 eval \`dpkg\-architecture \-u\`
 .PP
-Check if an architecture is equal to the current architecture or a given
-one:
+Check if the current or specified host architecture is equal to an
+architecture:
 .IP
 dpkg\-architecture \-elinux\-alpha
 .IP
 dpkg\-architecture \-amips \-elinux\-mips
 .PP
-Check if the current architecture or an architecture provided with \fB\-a\fP
-are Linux systems:
+Check if the current or specified host architecture is a Linux system:
 .IP
 dpkg\-architecture \-ilinux\-any
 .IP

+ 4 - 4
scripts/dpkg-architecture.pl

@@ -47,8 +47,8 @@ sub usage {
 'Usage: %s [<option>...] [<command>]')
     . "\n\n" . _g(
 'Options:
-  -a<debian-arch>    set current Debian architecture.
-  -t<gnu-system>     set current GNU system type.
+  -a<debian-arch>    set host Debian architecture.
+  -t<gnu-system>     set host GNU system type.
   -A<debian-arch>    set target Debian architecture.
   -T<gnu-system>     set target GNU system type.
   -f                 force flag (override variables set in environment).')
@@ -56,8 +56,8 @@ sub usage {
 'Commands:
   -l                 list variables (default).
   -L                 list valid architectures.
-  -e<debian-arch>    compare with current Debian architecture.
-  -i<arch-alias>     check if current Debian architecture is <arch-alias>.
+  -e<debian-arch>    compare with host Debian architecture.
+  -i<arch-alias>     check if host Debian architecture is <arch-alias>.
   -q<variable>       prints only the value of <variable>.
   -s                 print command to set environment variables.
   -u                 print command to unset environment variables.