The following commit has been merged in the master branch:
commit 89973c5bb9eed790242a7d1d35564fd954edf554
Author: Guillem Jover <guil...@debian.org>
Date: Sat Aug 20 15:36:00 2011 +0200
u-a: Do not build strings from parts in alternative_check_install_args
This makes the work of translators harder.
diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
index 20c2545..8e82bb6 100644
--- a/utils/update-alternatives.c
+++ b/utils/update-alternatives.c
@@ -2147,15 +2147,15 @@ alternative_check_install_args(struct alternative
*inst_alt,
found = alternative_map_find(alt_map_parent, sl->name);
if (found &&
strcmp(found->master_name, inst_alt->master_name) != 0) {
- char *msg;
-
if (strcmp(found->master_name, sl->name) == 0)
- msg = _("it is a master alternative.");
+ error(_("alternative %s can't be slave of %s: "
+ "it is a master alternative."),
+ sl->name, inst_alt->master_name);
else
- xasprintf(&msg, _("it is a slave of %s"),
- found->master_name);
- error(_("alternative %s can't be slave of %s: %s"),
- sl->name, inst_alt->master_name, msg);
+ error(_("alternative %s can't be slave of %s: "
+ "it is a slave of %s"),
+ sl->name, inst_alt->master_name,
+ found->master_name);
}
found = alternative_map_find(alt_map_links, sl->link);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
