From owner-freebsd-ports@FreeBSD.ORG Tue Mar 20 17:22:48 2007 Return-Path: X-Original-To: ports@freebsd.org Delivered-To: freebsd-ports@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BAD2816A400; Tue, 20 Mar 2007 17:22:48 +0000 (UTC) (envelope-from sem@FreeBSD.org) Received: from mail.ciam.ru (ns.ciam.ru [213.247.195.75]) by mx1.freebsd.org (Postfix) with ESMTP id 78BBC13C45A; Tue, 20 Mar 2007 17:22:48 +0000 (UTC) (envelope-from sem@FreeBSD.org) Received: from [87.240.16.199] (helo=[192.168.0.2]) by mail.ciam.ru with esmtpa (Exim 4.x) id 1HTi2m-0000XB-Vw; Tue, 20 Mar 2007 20:22:45 +0300 Message-ID: <46001864.8050005@FreeBSD.org> Date: Tue, 20 Mar 2007 20:22:44 +0300 From: Sergey Matveychuk User-Agent: Thunderbird 1.5.0.10 (Windows/20070221) MIME-Version: 1.0 To: Andrew Pantyukhin References: <1174330341.26866.32.camel@shumai.marcuscom.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: ports@freebsd.org, fullermd@over-yonder.net, parv@pair.com Subject: Re: Problems running pkgdb -fF X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Mar 2007 17:22:48 -0000 Andrew Pantyukhin wrote: > On 3/19/07, Joe Marcus Clarke wrote: >> Running pkgdb -Ff today gives me the following error: > > Just a "me too" here, and this problem appears during > portupgrade runs, too. > Try the patch please. I could not find a box where I can reproduce the error, so it's not tested. Just a obvious quick fix. Index: pkgtools.rb =================================================================== RCS file: /cvsroot/portupgrade/pkgtools/lib/pkgtools.rb,v retrieving revision 1.16.2.4 diff -u -r1.16.2.4 pkgtools.rb --- pkgtools.rb 27 Feb 2007 11:34:59 -0000 1.16.2.4 +++ pkgtools.rb 20 Mar 2007 17:18:35 -0000 @@ -790,8 +790,7 @@ contents_file = $pkgdb.pkg_contents(pkgname) if grep_q_file(/^@comment[ \t]+ORIGIN:/, contents_file) - command = shelljoin('sed', - "s|^\\(@comment[ \t][ \t]*ORIGIN:\\).*$|\\1#{origin}|") + command = "sed s|^\\(@comment[ \t][ \t]*ORIGIN:\\).*$|\\1#{origin}|" else command = "(cat; echo '@comment ORIGIN:#{origin}')" end -- Dixi. Sem.