The following commit has been merged in the master branch:
commit 37a7407d040e5e6c33ebad6c029cc36d2a2768d5
Author: Raphael Hertzog <[email protected]>
Date: Sat Jul 25 15:49:35 2009 +0200
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.
diff --git a/debian/changelog b/debian/changelog
index b708f5f..dbe76dd 100644
--- a/debian/changelog
+++ b/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.
diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index ac3d67f..e8ac314 100755
--- a/scripts/update-alternatives.pl
+++ b/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 " .
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
