Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Sun, 17 Nov 2019 15:12:42
Message-Id: 1574003151.99f0dfe5e074dcd41155cdcd7b1c2e8abe825f50.grobian@gentoo
1 commit: 99f0dfe5e074dcd41155cdcd7b1c2e8abe825f50
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 17 15:05:51 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 17 15:05:51 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=99f0dfe5
7
8 qpkg: drop misleading and incorrect message about unmatched packages
9
10 there is no relationship between input arguments and output packages
11 made (e.g. slots, sub-matches, etc.)
12
13 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
14
15 qpkg.c | 7 ++-----
16 1 file changed, 2 insertions(+), 5 deletions(-)
17
18 diff --git a/qpkg.c b/qpkg.c
19 index 7a1baae..f5e8168 100644
20 --- a/qpkg.c
21 +++ b/qpkg.c
22 @@ -430,7 +430,8 @@ int qpkg_main(int argc, char **argv)
23 atom = tree_get_atom(pkg_ctx, false);
24 snprintf(buf, sizeof(buf), "%s/%s", atom->CATEGORY, atom->PN);
25 for (i = optind; i < argc; ++i) {
26 - if (!argv[i]) continue;
27 + if (argv[i] == NULL)
28 + continue;
29
30 if (!strcmp(argv[i], atom->PN) ||
31 !strcmp(argv[i], atom->P) ||
32 @@ -443,10 +444,6 @@ int qpkg_main(int argc, char **argv)
33 }
34 }
35
36 - s = (argc - optind) - pkgs_made;
37 - if (s && !pretend)
38 - printf(" %s*%s %i package%s could not be matched :/\n",
39 - RED, NORM, (int)s, (s > 1 ? "s" : ""));
40 if (pkgs_made)
41 qprintf(" %s*%s Packages can be found in %s\n",
42 GREEN, NORM, qpkg_bindir);