Просмотр исходного кода

Refer to “half configured” instead of “failed config”

Use it in «dpkg-query -l» header and dselect package status printing for
consistency with the rest of the ouput. This seems to have been a source
of confusion in the past, so we'll try to use this nomenclature to refer
to this package status.
Guillem Jover лет назад: 16
Родитель
Сommit
6d784ebcd1
3 измененных файлов с 4 добавлено и 2 удалено
  1. 2 0
      debian/changelog
  2. 1 1
      dselect/pkgdisplay.cc
  3. 1 1
      src/query.c

+ 2 - 0
debian/changelog

@@ -13,6 +13,8 @@ dpkg (1.15.6) UNRELEASED; urgency=low
   * Improve update-alternatives --display output to use two leading spaces
   * Improve update-alternatives --display output to use two leading spaces
     for current link and slave information. Use single quotes for both “best”
     for current link and slave information. Use single quotes for both “best”
     and the alternative it's pointing to. Closes: #549167
     and the alternative it's pointing to. Closes: #549167
+  * Refer to “half configured” instead of “failed config” in «dpkg-query -l»
+    header and dselect package status printing for consistency.
 
 
   [ Updated man page translations ]
   [ Updated man page translations ]
   * German (Helge Kreutzmann).
   * German (Helge Kreutzmann).

+ 1 - 1
dselect/pkgdisplay.cc

@@ -51,7 +51,7 @@ const char
 			    N_("removed (configs remain)"),
 			    N_("removed (configs remain)"),
 			    N_("half installed"),
 			    N_("half installed"),
 			    N_("unpacked (not set up)"),
 			    N_("unpacked (not set up)"),
-			    N_("failed config"),
+			    N_("half configured (config failed)"),
 			    N_("awaiting trigger processing"),
 			    N_("awaiting trigger processing"),
 			    N_("triggered"),
 			    N_("triggered"),
 			    N_("installed"),
 			    N_("installed"),

+ 1 - 1
src/query.c

@@ -113,7 +113,7 @@ list1package(struct pkginfo *pkg, int *head, struct pkg_array *array)
   if (!*head) {
   if (!*head) {
     fputs(_("\
     fputs(_("\
 Desired=Unknown/Install/Remove/Purge/Hold\n\
 Desired=Unknown/Install/Remove/Purge/Hold\n\
-| Status=Not/Inst/Cfg-files/Unpacked/Failed-cfg/Half-inst/trig-aWait/Trig-pend\n\
+| Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend\n\
 |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)\n"), stdout);
 |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)\n"), stdout);
     printf(format,'|','|','/', _("Name"), _("Version"), 40, _("Description"));
     printf(format,'|','|','/', _("Name"), _("Version"), 40, _("Description"));
     printf("+++-");					/* status */
     printf("+++-");					/* status */