[Reproducible-commits] [dpkg] 08/61: u-a: Print master and slave links on --display

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 55661248cc3028446b9e73eb17e41fa12aad2b54
Author: Guillem Jover <guillem at debian.org>
Date:   Thu Dec 18 20:55:24 2014 +0100

    u-a: Print master and slave links on --display
---
 debian/changelog            | 1 +
 man/update-alternatives.1   | 1 +
 utils/update-alternatives.c | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4663a41..9389db3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dpkg (1.18.3) UNRELEASED; urgency=low
   [ Guillem Jover ]
   * Fix short-lived memory leaks in start-stop-daemon. As a side effect now
     a missing group after ‘:’ on --chuid is a fatal error.
+  * Print the master and slave links in «update-alternatives --display».
   * Perl modules:
     - Only warn on invalid week days instead of aborting in
       Dpkg::Changelog::Entry::Debian. Regression introduced in dpkg 1.18.2.
diff --git a/man/update-alternatives.1 b/man/update-alternatives.1
index c6711e8..38f5821 100644
--- a/man/update-alternatives.1
+++ b/man/update-alternatives.1
@@ -302,6 +302,7 @@ to point to the highest priority installed alternatives.
 Display information about the link group.
 Information displayed includes the group's mode
 (auto or manual),
+the master and slave links,
 which alternative the master link currently points to,
 what other alternatives are available
 (and their corresponding slave alternatives),
diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
index 0911594..10be8a3 100644
--- a/utils/update-alternatives.c
+++ b/utils/update-alternatives.c
@@ -1539,6 +1539,9 @@ alternative_display_user(struct alternative *a)
 	} else {
 		pr(_("  link currently absent"));
 	}
+	pr(_("  link %s is %s"), a->master_name, a->master_link);
+	for (sl = a->slaves; sl; sl = sl->next)
+		pr(_("  slave %s is %s"), sl->name, sl->link);
 
 	for (fs = a->choices; fs; fs = fs->next) {
 		pr(_("%s - priority %d"), fs->master_file, fs->priority);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git