Message ID | 20200123004927.78766-1-allan@archlinux.org |
---|---|
State | Accepted, archived |
Headers | show
Return-Path: <pacman-dev-bounces@archlinux.org> Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 42DF716825D37 for <patchwork@archlinux.org>; Thu, 23 Jan 2020 00:49:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_NONE=-0.0001,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.3 X-Spam-BL-Results: <dns:1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.7.8.0.6.0.6.1.0.8.f.4.0.1.0.a.2.list.dnswl.org> [127.0.9.0] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for <patchwork@archlinux.org>; Thu, 23 Jan 2020 00:49:58 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 7FEFA1848E43AA; Thu, 23 Jan 2020 00:49:48 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 0BBB01848E43A3; Thu, 23 Jan 2020 00:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1579740588; bh=1kXAOZh6MhocbxTUcE+D5G0tDDXyZA+NK1oht1sJAg0=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Reply-To; b=H7EaQiZLrqAx1icUn4Q6sgy7+yC3WNpImkoFB5BPpKcfLPr7xgbNAmKPS4bXp1xZe qBJl1cWijX0i9xRJ3nTg5Ut6cUVxZNWInKjCy+iUu0YRQ0cUpHf1oPY90IsNEG6kcz DbQlBAzTKW1B5zLXcOAtOl8PSay1+0zbKtgJlwkUmbNN9RaDwGk04q6d+0yJfv7wj9 1vSDy4I3ZWpjeoUtS+SyD7FsRLVrgs8yQFiqBPtmrjd8/LaLK7T2CIxoT4+RHNrM5e pJ1SmR+Ag0Pvqk0DxZh9vk0Kpj3CFfrJBuspyNTpwE6aIV4aGsiIg0BJFw1Lvyc29B 22W+cdfqFK24AFB0X7l0GQykumor5ol6xrrlV3Hw1P26woxrM2mob3RZt3hBl6yWwj GIPr+gC9Vkdy2T4WZadSIdG+waN2lTab3rTZpdpiH42KDf96gKlClQrNgtQFjf4k3I LrkNcTzGa5WC+1lkVxtxh1By3SQjLQEYVwutBFzJA/+ikd38sGyYeX4HHCmxz8ICsr hYRsehd+/nYBa5Bz2QN+g+YTYU0JSNRfTgwRsUaLwATRsZ4AK4v3Qc6U3E275uhj3R nnwSH1i5F6+Ek2Esh2l9bKcRg4r6uQrp70QBUbE3HSsuV9Gf+qZD7svDPE8b9TFcu7 oCnHSBHJk1WZZvSUzNZZSxPg= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id F19D32BE61; Thu, 23 Jan 2020 00:49:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1579740588; bh=1kXAOZh6MhocbxTUcE+D5G0tDDXyZA+NK1oht1sJAg0=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Reply-To; b=aWAv1rAPaMAwotMgRuUVfmwOsf3vpG3tTgb9Rvx48+2Nzl+i+yqV2OEtwfExi2JQo I44zcWas3YJ3XGjReK+437RHBkS7F37GWHtxNUUzINe9Dm94WdLGeiizn6lGfi+9A+ XsapflmZ77pmyf08YR3bdkYdrS6nxr6BSBj3U31NgtwLbLP+InfA8wFeHuCGSO8to2 CrDTvV5Ic2LI2YUnzIIZVCk3v3CVbXLQcOuK1rBVXu8QKRHC2ZsFWBUsOr5WVWLKCu FCDXc6fvkNZaBAMGOUxRxvCT9rf4IQRSp76tA+grW2wc37gHvvUqlks2pgTbbVWUWd XIGrZoXh2Vvs1gvsoXdqcHxUmAdr43gxLOlEv4QlH0N9cr5j2kOXmgtQeK7f2A3u4u 8zJERzTbg7l4Bty0ANRakyZbfLsCECMkmgN/PGdASTMb0uaPEb9wCKcEaCZcrdooT8 Ijap01AXBPaOjjXvXriQbGeH2Xf4RcjD4DrDzygqmgjEOK8TuWV6WHAQUi2he3A0/1 mzDjJLTlnVRNXxWhFiMD9rVY1pQSZGeRKGVg5OS0NjeDAdGJvvnjKsPvxnYo+fHHg8 vaAU8lKzFXcMjcKa3u/bVRbR+noZkfOoJ6BbgOMvId8J+xNEZO+ro/LHLQmixkMukB m4Qn7KguwCoxNKzaU6HByHaQ= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 134FE2BE5B for <pacman-dev@lists.archlinux.org>; Thu, 23 Jan 2020 00:49:43 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for <pacman-dev@lists.archlinux.org>; Thu, 23 Jan 2020 00:49:43 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 863D91848E4399 for <pacman-dev@lists.archlinux.org>; Thu, 23 Jan 2020 00:49:41 +0000 (UTC) Received: from kamala.staff.eduroam.uq.edu.au (unknown [130.102.13.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: allan) by orion.archlinux.org (Postfix) with ESMTPSA id C88331848E4398 for <pacman-dev@archlinux.org>; Thu, 23 Jan 2020 00:49:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1579740581; bh=1kXAOZh6MhocbxTUcE+D5G0tDDXyZA+NK1oht1sJAg0=; h=From:To:Subject:Date; b=l4EUeX3E5HllFoDtYvYKO/RozRFn12erL62xD9dt78yWDSFg1mymTMI9BAWkV7hBg DM5fmePn8SIxQdXrswciDsbNhxol51mqtCJzmC1vEFJ9buQJeGrUYf12sSogS1iq+b zSgjaaAH4hefkcNVqbecbUmM6N7/mK98UTGWj/Wb1HUzukkpOpnkr6D07dB6rQTDix 3Y6yRuaVtXVjgnCyDH+NizExXL+B1okpZaUJRlGMTmR48FMtZEx+ENcuHxhQjc5VT/ 4Q8mAV2sQqE34NWIqOxwUNtJUm5JdUN6tPOZMqpXtCvL8RQbr7T8tdhFn48bOtcBR3 4lxQvWKvMtVSSQH5mhPJCB8q0xatVAX3jZmSwrj8/de2/PvrEc9blLC2GIg6t8VWcI pgBG3QqLQogYfQEtiM2Wa2Max2AKUFbb5Mya7S7RFBi3D7BJCcy4/XLsVND1Bl61nq f/tgnlLIMQFoksvAuBxMByhFsQNMCMJxZLjKDfUihKrWB+w5GkwyvL6VAc5P8YnGdD S99ZSBYbYEm4M+XvzvNObBjV/gxmPjhPmfGX8ODwrTy5QSFGSim+ZAhnzJR6X6M9RQ Rjg/hZcs6MDPX/DzucC0vp/1+7W+QCkXO4iEr+DSL2I3VUBZTm6TzPUNgHCuEZCZnt duMUpC4fW1LM+tc+Ad2pBsW0= From: Allan McRae <allan@archlinux.org> To: pacman-dev@archlinux.org Date: Thu, 23 Jan 2020 10:49:27 +1000 Message-Id: <20200123004927.78766-1-allan@archlinux.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [pacman-dev] [PATCH] Fix "pacman -U <url>" operations X-BeenThere: pacman-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for pacman development <pacman-dev.archlinux.org> List-Unsubscribe: <https://lists.archlinux.org/options/pacman-dev>, <mailto:pacman-dev-request@archlinux.org?subject=unsubscribe> List-Archive: <https://lists.archlinux.org/pipermail/pacman-dev/> List-Post: <mailto:pacman-dev@archlinux.org> List-Help: <mailto:pacman-dev-request@archlinux.org?subject=help> List-Subscribe: <https://lists.archlinux.org/listinfo/pacman-dev>, <mailto:pacman-dev-request@archlinux.org?subject=subscribe> Reply-To: Discussion list for pacman development <pacman-dev@archlinux.org> Errors-To: pacman-dev-bounces@archlinux.org Sender: "pacman-dev" <pacman-dev-bounces@archlinux.org> |
Series |
[pacman-dev] Fix "pacman -U <url>" operations
|
expand
|
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index b3e6a411..e72a0b2a 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -415,7 +415,7 @@ static int curl_download_internal(struct dload_payload *payload, curl_set_handle_opts(payload, curl, error_buffer); - if(payload->max_size == payload->initial_size) { + if(payload->max_size == payload->initial_size && payload->max_size != 0) { /* .part file is complete */ ret = 0; goto cleanup;
Commit e6a6d307 detected complete part files by comparing a payload's max_size to initial_size. However, these values are also equal when we use pacman -U on a URL as max_size is set to 0 in that case. Add a further condition to avoid that. Signed-off-by: Allan McRae <allan@archlinux.org> --- lib/libalpm/dload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)