[SCM] dpkg's main repository branch, master, updated. 1.16.2-106-gfd35aec

[Guillem Jover]

The following commit has been merged in the master branch:
commit d6dbd80a94abd65b65ec98064bbd5973764532d4
Author: Guillem Jover <guil...@debian.org>
Date:   Mon Apr 16 03:27:51 2012 +0200

    u-a: Merge display action handling into previous if/else block

diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
index f9ac81b..b0867d4 100644
--- a/utils/update-alternatives.c
+++ b/utils/update-alternatives.c
@@ -2609,9 +2609,7 @@ main(int argc, char **argv)
                log_msg("run with %s", get_argv_string(argc, argv));
                alternative_set_selections(stdin, _("<standard input>"));
                exit(0);
-       }
-
-       if (strcmp(action, "display") == 0) {
+       } else if (strcmp(action, "display") == 0) {
                alternative_display_user(a);
                exit(0);
        } else if (strcmp(action, "query") == 0) {

-- 
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