Преглед изворни кода

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.
Guillem Jover пре 13 година
родитељ
комит
82c09cd40d
2 измењених фајлова са 4 додато и 2 уклоњено
  1. 2 0
      debian/changelog
  2. 2 2
      src/querycmd.c

+ 2 - 0
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.
     New glibc 2.16 and later, issue a warning on this condition.
     Closes: #691745
     Closes: #691745
   * Refer to path instead of file on dpkg-statoverride.
   * 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 <guillem@debian.org>  Fri, 03 Aug 2012 13:21:00 +0200
  -- Guillem Jover <guillem@debian.org>  Fri, 03 Aug 2012 13:21:00 +0200
 
 

+ 2 - 2
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));
       plen = strlen(pkg_name(array->pkgs[i], pnaw_nonambig));
       vlen = strlen(versiondescribe(&array->pkgs[i]->installed.version,
       vlen = strlen(versiondescribe(&array->pkgs[i]->installed.version,
                                     vdew_nonambig));
                                     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);
       pkg_summary(array->pkgs[i], &array->pkgs[i]->installed, &dlen);
 
 
       if (plen > fmt->nw)
       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_abbrev_eflag(pkg),
                     pkg_name(pkg, pnaw_nonambig),
                     pkg_name(pkg, pnaw_nonambig),
                     versiondescribe(&pkg->installed.version, vdew_nonambig),
                     versiondescribe(&pkg->installed.version, vdew_nonambig),
-                    pkg->installed.arch->name,
+                    dpkg_arch_describe(pkg->installed.arch),
                     pdesc, l);
                     pdesc, l);
 }
 }