From owner-freebsd-python@FreeBSD.ORG Wed Jun 10 15:59:44 2009 Return-Path: Delivered-To: python@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6EB4A106564A; Wed, 10 Jun 2009 15:59:44 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: from wf-out-1314.google.com (wf-out-1314.google.com [209.85.200.173]) by mx1.freebsd.org (Postfix) with ESMTP id 2AA308FC15; Wed, 10 Jun 2009 15:59:44 +0000 (UTC) (envelope-from r.c.ladan@gmail.com) Received: by wf-out-1314.google.com with SMTP id 24so341926wfg.7 for ; Wed, 10 Jun 2009 08:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=b4EgsDZ7L4JnzMLZ0gNcjYD7HJ45Vh93Z4/yQrX3YfE=; b=Aqnh0aAtIKD8ntZRIsoigowjiq95W+V+UZxs8FFrNZwYNOOJ9G5c0xahT9z88gMX6o zN8fKDuRJtrQAe8zYb55CWbCw8nvO5tPKV987AAN/rSwoVoqxUocP6sq0AvG7ngGd5DD aD82CIf1zUIz0pmKWpQijoYcG4NtQ4K4LkPSg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=jWXfJMS6+qAZrLuro1Fyys3aVa2asIXhxR0Xzk84GCd0tHSVCZNH0Kc/+a9rxeQ4iW 6w8KBKItGTpxExPdEiXEdnZPxvzJSX193XLmtOfDsHK3SR2dIxgHdrXOegd9E4UFyhPe 9pOnBdZG6+QCzL6+OwQ0WkY+99axUfhJUAH/A= MIME-Version: 1.0 Received: by 10.220.46.10 with SMTP id h10mr1173834vcf.8.1244649583051; Wed, 10 Jun 2009 08:59:43 -0700 (PDT) In-Reply-To: <20090610154111.GC61383@atarininja.org> References: <20090610132647.GC40713@atarininja.org> <20090610151212.GB61383@atarininja.org> <20090610154111.GC61383@atarininja.org> Date: Wed, 10 Jun 2009 17:59:42 +0200 Message-ID: From: Rene Ladan To: Wesley Shields Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: ports@freebsd.org, python@freebsd.org, miwi@freebsd.org Subject: Re: Python 2.6 update with portmaster X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2009 15:59:45 -0000 2009/6/10 Wesley Shields : > On Wed, Jun 10, 2009 at 05:26:40PM +0200, Rene Ladan wrote: >> 2009/6/10 Wesley Shields : >> > On Wed, Jun 10, 2009 at 04:44:41PM +0200, Rene Ladan wrote: >> >> 2009/6/10 Wesley Shields : >> >> > Here's a patch[1] that allows you to use portmaster when doing the = python >> >> > upgrade. I intend to commit this tomorrow morning unless someone sp= eaks >> >> > up. I'll also be adding the instructions to the UPDATING entry. >> >> > >> >> > Once applied you should be able to use: >> >> > >> >> > cd /usr/ports/lang/python && make upgrade-site-packages -DUSE_PORTM= ASTER >> >> > >> >> > It will be quite slow compared to using pkg_which (the normal metho= d) so >> >> > be patient. I've used this patch to upgrade one lightly used machin= e and >> >> > I know at least one other person has survived an upgrade of a machi= ne >> >> > with over 1000 ports installed. >> >> > >> >> > [1]: http://people.freebsd.org/~wxs/python26-portmaster.diff >> >> > >> >> I applied the patch, but there is something wrong: >> >> >> >> > # make upgrade-site-packages -DUSE_PORTMASTER >> >> > Syntax error: end of file unexpected (expecting "}") >> >> > *** Error code 2 >> >> > >> >> > Stop in /usr/ports/lang/python. >> > >> > Sorry, updated the patch to address this. Please revert and try again. >> > >> > -- WXS >> > >> >> Still not :-( : >> >> > # patch > > Hmm... =A0Looks like a unified diff to me... >> > The text leading up to this was: >> > -------------------------- >> > |Index: Makefile >> > |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> > |RCS file: /ncvs/ports/lang/python/Makefile,v >> > |retrieving revision 1.161 >> > |diff -u -r1.161 Makefile >> > |--- Makefile =A0 31 Jul 2007 16:28:32 -0000 =A0 =A0 =A01.161 >> > |+++ Makefile =A0 10 Jun 2009 15:15:23 -0000 >> > -------------------------- >> > Patching file Makefile using Plan A... >> > Hunk #1 succeeded at 24. >> > Hunk #2 succeeded at 46. >> > done >> > # make upgrade-site-packages -DUSE_PORTMASTER >> > >> > =3D=3D=3D>>> /var/db/pkg/-f does not exist >> > =3D=3D=3D>>> Aborting update >> > >> > *** Signal 15 >> > >> > Terminated >> > Stop in /usr/ports/lang/python. >> > # >> >> portmaster-2.7, python-2.6,2 and python26-2.6.2 are installed. >> This is on 7.2-RELEASE/i386 with portsnap tree as of "now". > > The patch was only tested with PORTUPGRADE_ARGS defined. In the > case where it wasn't defined you would run into the issue you described. > I think I've fixed it now, so please revert and try again. Sorry for the > problems, but like I said earlier this is to get it more exposure. > > Please revert, fetch the patch again and apply. > It now also works fine without PORTUPGRADE_ARGS defined, i.e. just # ( cd /usr/ports/lang/python && make upgrade-site-packages -DUSE_PORTMASTE= R ) Thanks, Ren=E9 --=20 http://www.rene-ladan.nl/ GPG fingerprint =3D E738 5471 D185 7013 0EE0 4FC8 3C1D 6F83 12E1 84F6 (subkeys.pgp.net)