From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 15 15:40:26 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 124BF16A4CE for ; Mon, 15 Nov 2004 15:40:26 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE68B43D1D for ; Mon, 15 Nov 2004 15:40:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) iAFFeP3S014163 for ; Mon, 15 Nov 2004 15:40:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id iAFFePuX014162; Mon, 15 Nov 2004 15:40:25 GMT (envelope-from gnats) Resent-Date: Mon, 15 Nov 2004 15:40:25 GMT Resent-Message-Id: <200411151540.iAFFePuX014162@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Charles Ulrich Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED6D116A4D0 for ; Mon, 15 Nov 2004 15:39:42 +0000 (GMT) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id D790443D48 for ; Mon, 15 Nov 2004 15:39:42 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.12.11/8.12.11) with ESMTP id iAFFdgJE092294 for ; Mon, 15 Nov 2004 15:39:42 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.12.11/8.12.11/Submit) id iAFFdgZb092293; Mon, 15 Nov 2004 15:39:42 GMT (envelope-from nobody) Message-Id: <200411151539.iAFFdgZb092293@www.freebsd.org> Date: Mon, 15 Nov 2004 15:39:42 GMT From: Charles Ulrich To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Subject: ports/73972: [patch] systutils/rdiff-backup: exception raised on EDEADLK X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Nov 2004 15:40:26 -0000 >Number: 73972 >Category: ports >Synopsis: [patch] systutils/rdiff-backup: exception raised on EDEADLK >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Nov 15 15:40:25 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Charles Ulrich >Release: 4.10-STABLE >Organization: Ideal Solution, LLC >Environment: FreeBSD DualAth.atmosphereannealing.com 4.9-STABLE FreeBSD 4.9-STABLE #1: Tue Mar 9 18:16:52 EST 2004 root@DualAth.atmosphereannealing.com:/usr/obj/usr/src/sys/DUALATH i386 >Description: In rdiff-backup's robust.py module, there is a function called catch_error which attempts to "step over" certain operating system errors that should not be fatal to the backup as a whole. In this, EDEADLOCK is listed, but not its BSD equivalent, EDEADLK. >How-To-Repeat: Mount an SMB share via smbfs and use rdiff-backup to back up a directory containing a file that is opened on a Windows machine. Outlook .pst files are the best candidates. rdiff-backup will raise an exception, '[Errno 11] Resource deadlock avoided' upon encountering the file and halt the backup. >Fix: To fix this, add the EDEADLK error to catch_error in robust.py. EDEADLK could replace EDEADLOCK in the list as FreeBSD doesn't use the latter (that I can tell), but perhaps the patch will make it upstream. I believe tabs have been preserved properly. If not, it's a two-liner anyway. Thanks for your time. --- robust.py.orig 2004-11-15 10:08:58.000000000 -0500 +++ robust.py 2004-11-15 10:09:44.000000000 -0500 @@ -53,7 +53,8 @@ errno.errorcode[exc[0]] in ('EPERM', 'ENOENT', 'EACCES', 'EBUSY', 'EEXIST', 'ENOTDIR', 'ENAMETOOLONG', 'EINTR', 'ENOTEMPTY', 'EIO', 'ETXTBSY', - 'ESRCH', 'EINVAL', 'EDEADLOCK'))): + 'ESRCH', 'EINVAL', 'EDEADLOCK', + 'EDEADLK'))): return 1 return 0 >Release-Note: >Audit-Trail: >Unformatted: