From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B48F1382C5 for ; Thu, 21 May 2020 11:13:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56A87E08F2; Thu, 21 May 2020 11:13:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E64DE08F2 for ; Thu, 21 May 2020 11:13:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED3EB34EF3C for ; Thu, 21 May 2020 11:13:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 775E6254 for ; Thu, 21 May 2020 11:13:52 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1590059574.9935434aa78f4458f45fe2daf9292a3534cb370c.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qlop.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 9935434aa78f4458f45fe2daf9292a3534cb370c X-VCS-Branch: master Date: Thu, 21 May 2020 11:13:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 18f3d814-1ea1-42b7-8b7b-9f7d56d0ad97 X-Archives-Hash: 26a1e1c8d860d64bbc7c12ebd2a228e9 commit: 9935434aa78f4458f45fe2daf9292a3534cb370c Author: Fabian Groffen gentoo org> AuthorDate: Thu May 21 11:12:54 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu May 21 11:12:54 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9935434a qlop: fix inversed logic introduced in 20844dc943700cca72bbb6896f42adcd30de41e3, the intention was to suppress the warning, not raise it. Signed-off-by: Fabian Groffen gentoo.org> qlop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qlop.c b/qlop.c index d5ace83..5048b1e 100644 --- a/qlop.c +++ b/qlop.c @@ -1457,7 +1457,7 @@ int qlop_main(int argc, char **argv) /* handle -l / -d conflict */ if (start_time != 0 && m.show_lastmerge) { - if (m.show_emerge) + if (!m.show_emerge) warn("-l and -d cannot be used together, dropping -l"); m.show_lastmerge = 0; }