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: Thu, 21 May 2020 11:13:56
Message-Id: 1590059574.9935434aa78f4458f45fe2daf9292a3534cb370c.grobian@gentoo
1 commit: 9935434aa78f4458f45fe2daf9292a3534cb370c
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 21 11:12:54 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu May 21 11:12:54 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9935434a
7
8 qlop: fix inversed logic
9
10 introduced in 20844dc943700cca72bbb6896f42adcd30de41e3, the intention
11 was to suppress the warning, not raise it.
12
13 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
14
15 qlop.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18 diff --git a/qlop.c b/qlop.c
19 index d5ace83..5048b1e 100644
20 --- a/qlop.c
21 +++ b/qlop.c
22 @@ -1457,7 +1457,7 @@ int qlop_main(int argc, char **argv)
23
24 /* handle -l / -d conflict */
25 if (start_time != 0 && m.show_lastmerge) {
26 - if (m.show_emerge)
27 + if (!m.show_emerge)
28 warn("-l and -d cannot be used together, dropping -l");
29 m.show_lastmerge = 0;
30 }