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

u-a: Improve --display output

Use two leading spaces for current link and slave information. Use
single quotes for both “best” and the alternative it's pointing to.

Closes: #549167
Guillem Jover пре 16 година
родитељ
комит
a796023222
2 измењених фајлова са 7 додато и 4 уклоњено
  1. 3 0
      debian/changelog
  2. 4 4
      scripts/update-alternatives.pl

+ 3 - 0
debian/changelog

@@ -10,6 +10,9 @@ dpkg (1.15.6) UNRELEASED; urgency=low
   * Add a --version option to dpkg-checkbuilddeps.
   * Improve and mark more messages in writedb() to make translators lifes
     easier. Closes: #408525
+  * Improve update-alternatives --display output to use two leading spaces
+    for current link and slave information. Use single quotes for both “best”
+    and the alternative it's pointing to. Closes: #549167
 
   [ Updated man page translations ]
   * German (Helge Kreutzmann).

+ 4 - 4
scripts/update-alternatives.pl

@@ -905,23 +905,23 @@ sub display_user {
         ($self->status() eq "auto") ? _g("auto mode") : _g("manual mode"));
 
     if ($self->has_current_link()) {
-	pr(_g(" link currently points to %s"), $self->current());
+	pr(_g("  link currently points to %s"), $self->current());
     } else {
-	pr(_g(" link currently absent"));
+	pr(_g("  link currently absent"));
     }
     foreach my $choice ($self->choices()) {
         my $fileset = $self->fileset($choice);
 	pr(_g("%s - priority %s"), $choice, $fileset->priority());
         foreach my $slave ($self->slaves()) {
             if ($fileset->has_slave($slave)) {
-                pr(_g(" slave %s: %s"), $slave, $fileset->slave($slave));
+                pr(_g("  slave %s: %s"), $slave, $fileset->slave($slave));
             }
 	}
     }
 
     my $best = $self->best();
     if (defined($best) && $best) {
-	pr(_g("Current \`best' version is %s."), $best);
+	pr(_g("Current 'best' version is '%s'."), $best);
     } else {
 	pr(_g("No versions available."));
     }