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 95DBD13835A for ; Wed, 16 Jun 2021 19:21:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD9D3E081E; Wed, 16 Jun 2021 19:21:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A4E32E081E for ; Wed, 16 Jun 2021 19:21:53 +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 7D59B335D6A for ; Wed, 16 Jun 2021 19:21:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F22BE7A7 for ; Wed, 16 Jun 2021 19:21:50 +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: <1623871183.bf39c0fefdd990da681cd31376e556006e62cb10.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: bf39c0fefdd990da681cd31376e556006e62cb10 X-VCS-Branch: master Date: Wed, 16 Jun 2021 19:21:50 +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: 44df444b-9790-479e-b3be-a2a48a3ebd9f X-Archives-Hash: d546ce35aa5ab891913a94b1d271da06 commit: bf39c0fefdd990da681cd31376e556006e62cb10 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jun 16 19:03:08 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Jun 16 19:19:43 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=bf39c0fe qmerge: add comment about hash == NULL Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmerge.c b/qmerge.c index 7b42956..0e7ada4 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1514,7 +1514,7 @@ pkg_unmerge(tree_pkg_ctx *pkg_ctx, set *keep, char *hash = hash_file_at(portroot_fd, e->name + 1, HASH_MD5); protected = 0; - if (hash) + if (hash != NULL) /* if file was not removed */ protected = strcmp(e->digest, (const char *)hash); } break;