From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 52991 invoked by alias); 23 May 2017 16:47:09 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 52683 invoked by uid 89); 23 May 2017 16:47:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=Hx-languages-length:782 X-HELO: rgout0805.bt.lon5.cpcloud.co.uk Received: from rgout0805.bt.lon5.cpcloud.co.uk (HELO rgout0805.bt.lon5.cpcloud.co.uk) (65.20.0.152) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 23 May 2017 16:46:59 +0000 X-OWM-Source-IP: 86.164.192.158 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=7/50,refid=2.7.2:2017.5.23.161815:17:7.944,ip=,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __FROM_DOMAIN_IN_ANY_CC1, __ANY_URI, __URI_NO_MAILTO, __URI_NO_WWW, __NO_HTML_TAG_RAW, BODY_SIZE_700_799, BODYTEXTP_SIZE_3000_LESS, __MIME_TEXT_P1, __MIME_TEXT_ONLY, __SXL_SIG_TIMEOUT[ed24e7b3ee1a0cf1dcc55168175c7dea.sig.vir2.sophosxl.com], HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, IN_REP_TO, MSG_THREAD, __FROM_DOMAIN_IN_RCPT, __CC_REAL_NAMES, MULTIPLE_REAL_RCPTS, LEGITIMATE_SIGNS, BODY_SIZE_1000_LESS, BODY_SIZE_2000_LESS, __MIME_TEXT_P, REFERENCES, NO_URI_HTTPS, BODY_SIZE_7000_LESS Received: from localhost.localdomain (86.164.192.158) by rgout08.bt.lon5.cpcloud.co.uk (9.0.019.13-1) (authenticated as jonturney@btinternet.com) id 58BFF08008A26674; Tue, 23 May 2017 17:46:54 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 02/10] Correctly calculate total data to checksum when using IncludeSource Date: Tue, 23 May 2017 16:47:00 -0000 Message-Id: <20170523164558.50320-3-jon.turney@dronecode.org.uk> In-Reply-To: <20170523164558.50320-1-jon.turney@dronecode.org.uk> References: <20170523164558.50320-1-jon.turney@dronecode.org.uk> X-SW-Source: 2017-05/txt/msg00133.txt.bz2 Correctly account for source packages installed due to IncludeSource in the total amount of data to checksum. The fact that this obvious bug is unreported kind of suggests that no-one is actually using this option... --- install.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.cc b/install.cc index 3721047..79ddd20 100644 --- a/install.cc +++ b/install.cc @@ -745,7 +745,7 @@ do_install_thread (HINSTANCE h, HWND owner) md5sum_total_bytes += pkg.desired.source()->size; } - if (pkg.desired.sourcePackage ().picked()) + if (pkg.desired.sourcePackage ().picked() || IncludeSource) { md5sum_total_bytes += pkg.desired.sourcePackage ().source()->size; } -- 2.12.3