The following commit has been merged in the master branch:
commit 82c09cd40d3fa847a9f72e5d1ccd3484bde705ed
Author: Guillem Jover <[email protected]>
Date: Thu Oct 25 01:08:41 2012 +0200
dpkg-query: Always print a descriptive architecture column on --list
Print a description even for empty or missing architectures, to ensure
the column is always filled.
diff --git a/debian/changelog b/debian/changelog
index 1434fab..415cfb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,8 @@ dpkg (1.17.0) UNRELEASED; urgency=low
New glibc 2.16 and later, issue a warning on this condition.
Closes: #691745
* Refer to path instead of file on dpkg-statoverride.
+ * Always print a descriptive architecture column, even for empty or missing
+ architectures on «dpkg-query --list».
-- Guillem Jover <[email protected]> Fri, 03 Aug 2012 13:21:00 +0200
diff --git a/src/querycmd.c b/src/querycmd.c
index 135a465..1e5ff1f 100644
--- a/src/querycmd.c
+++ b/src/querycmd.c
@@ -115,7 +115,7 @@ list_format_init(struct list_format *fmt, struct pkg_array
*array)
plen = strlen(pkg_name(array->pkgs[i], pnaw_nonambig));
vlen = strlen(versiondescribe(&array->pkgs[i]->installed.version,
vdew_nonambig));
- alen = strlen(array->pkgs[i]->installed.arch->name);
+ alen = strlen(dpkg_arch_describe(array->pkgs[i]->installed.arch));
pkg_summary(array->pkgs[i], &array->pkgs[i]->installed, &dlen);
if (plen > fmt->nw)
@@ -221,7 +221,7 @@ list1package(struct pkginfo *pkg, struct list_format *fmt,
struct pkg_array *arr
pkg_abbrev_eflag(pkg),
pkg_name(pkg, pnaw_nonambig),
versiondescribe(&pkg->installed.version, vdew_nonambig),
- pkg->installed.arch->name,
+ dpkg_arch_describe(pkg->installed.arch),
pdesc, l);
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
