Sfoglia il codice sorgente

update-alternatives: fix a warning message

Mention the correct slave link that can't be installed due to a
conflicting file instead of quoting the master link.
Raphael Hertzog 17 anni fa
parent
commit
37a7407d04
2 ha cambiato i file con 3 aggiunte e 1 eliminazioni
  1. 2 0
      debian/changelog
  2. 1 1
      scripts/update-alternatives.pl

+ 2 - 0
debian/changelog

@@ -39,6 +39,8 @@ dpkg (1.15.4) UNRELEASED; urgency=low
     Closes: #535353
   * Fix dpkg-parsechangelog to include all entries with -v0 parameter.
     Closes: #537800
+  * Fix update-alternatives to mention the correct slave link that can't
+    be installed due to a conflicting file instead of quoting the master link.
 
   [ Modestas Vainius ]
   * Provide a meaningful label for dpkg-gensymbols diff.

+ 1 - 1
scripts/update-alternatives.pl

@@ -1031,7 +1031,7 @@ sub prepare_install {
                     main::checked_mv("$slink.dpkg-tmp", $slink);
                 });
             } else {
-                main::warning(_g("not replacing %s with a link."), $link);
+                main::warning(_g("not replacing %s with a link."), $slink);
             }
         } else {
             main::warning(_g("skip creation of %s because associated file " .