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 2EBB3138333 for ; Mon, 9 Apr 2018 07:15:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4662EE0CB7; Mon, 9 Apr 2018 07:15:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 24B95E0CB7 for ; Mon, 9 Apr 2018 07:15:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 632D8335C59 for ; Mon, 9 Apr 2018 07:15:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E903274 for ; Mon, 9 Apr 2018 07:15:40 +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: <1522952634.3ba7c294e8aa701c38a251728843c1a954f68c38.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: 3ba7c294e8aa701c38a251728843c1a954f68c38 X-VCS-Branch: master Date: Mon, 9 Apr 2018 07:15:40 +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-Archives-Salt: 949696a8-c6d3-4a07-a2b0-b492dbde1af7 X-Archives-Hash: 1784b562f17e32fc97cf31121b22e6b9 commit: 3ba7c294e8aa701c38a251728843c1a954f68c38 Author: Fabian Groffen gentoo org> AuthorDate: Thu Apr 5 18:23:54 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Apr 5 18:23:54 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3ba7c294 Revert "qmerge: Only fetch Packages if -f/-F is specified" This commit changed the logic from fetching Packages when -f is set, to forcing when -F is set. This is contradicting the documented behaviour and broke the tests. It is not clear to me anymore why this change was necessary, so I'm reverging it. This reverts commit eedb0ea266b78efd84bc34bc2c6602fb713ba590. qmerge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qmerge.c b/qmerge.c index 960a9a4..583e4fb 100644 --- a/qmerge.c +++ b/qmerge.c @@ -190,8 +190,8 @@ qmerge_initialize(void) mkdir_p(buf, 0755); xchdir(buf); - if (force_download) { - if (force_download == 2) + if (force_download != 2) { + if (force_download) unlink(Packages); if (access(Packages, R_OK) != 0)