From owner-freebsd-bugs@FreeBSD.ORG Sun Mar 21 01:30:02 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 554271065675 for ; Sun, 21 Mar 2010 01:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 17DAC8FC0C for ; Sun, 21 Mar 2010 01:30:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o2L1U1T5002669 for ; Sun, 21 Mar 2010 01:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2L1U1tO002668; Sun, 21 Mar 2010 01:30:01 GMT (envelope-from gnats) Resent-Date: Sun, 21 Mar 2010 01:30:01 GMT Resent-Message-Id: <201003210130.o2L1U1tO002668@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Garrett Cooper Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4E6E1065670 for ; Sun, 21 Mar 2010 01:25:37 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id C46518FC1B for ; Sun, 21 Mar 2010 01:25:37 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2L1PbeY063857 for ; Sun, 21 Mar 2010 01:25:37 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o2L1Pah4063856; Sun, 21 Mar 2010 01:25:36 GMT (envelope-from nobody) Message-Id: <201003210125.o2L1Pah4063856@www.freebsd.org> Date: Sun, 21 Mar 2010 01:25:36 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: bin/144919: [patch] [pkg_install] Remove partially downloaded file on fetch failure X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2010 01:30:02 -0000 >Number: 144919 >Category: bin >Synopsis: [patch] [pkg_install] Remove partially downloaded file on fetch failure >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Mar 21 01:30:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: 9-CURRENT >Organization: Cisco Systems, Inc. >Environment: FreeBSD bayonetta.local 9.0-CURRENT FreeBSD 9.0-CURRENT #5 r205310: Sat Mar 20 01:32:51 PDT 2010 gcooper@bayonetta.local:/usr/obj/usr/src/sys/BAYONETTA amd64 >Description: An annoyance I've had to deal with over the past week is that pkg_add -Kr on DNS resolution failure retains dummy 0 byte packages instead of deleting them on fetch failure. This patch removes the file when the fetch fails. >How-To-Repeat: pkg_add -Kr a_package_that_does_not_exist.tbz >Fix: See patch. Patch attached with submission follows: ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/url.c#1 - /scratch/freebsd/perforce/pkg_install-enhancements/usr.sbin/pkg_install/lib/url.c ==== @@ -108,6 +108,10 @@ if ((ftp = fetchGetURL(fname, Verbose ? "v" : NULL)) == NULL) { printf("Error: Unable to get %s: %s\n", fname, fetchLastErrString); + /* If the fetch fails, yank the package. */ + if (keep_package && unlink(pkg) < 0 && Verbose) { + warnx("failed to remove partially fetched package: %s", pkg); + } return NULL; } >Release-Note: >Audit-Trail: >Unformatted: