From owner-freebsd-python@FreeBSD.ORG Tue Sep 4 11:13:11 2012 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 92157106564A; Tue, 4 Sep 2012 11:13:11 +0000 (UTC) (envelope-from sbrabez@gmail.com) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id E1F978FC0A; Tue, 4 Sep 2012 11:13:10 +0000 (UTC) Received: by wgbds11 with SMTP id ds11so4701457wgb.31 for ; Tue, 04 Sep 2012 04:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=DMTfrnDD8Xl1gWxkChxQWbRnffZQ55acjtagKrOb8jA=; b=k9YlPdgSYt0IXOdVWMVsLw5ZZg+2dSWCdGwYp4dZPZnI7Bx0IC8ogk/NGQZy5oFtgh EjQ46ji6s/7nCjzwWthAiK2WI62GwQh6Ye8Yj19M18FzNTqCf+xjP9QlcEbw4hXJgPBV H/+iYgWnsmUBrSwFUVedTL72TTA8ulkBPBPzNO0UVlhkhAz7JgqTHFdGcdm/rX0HeP+P jQTPWmESQJGs1aFW4hYHonsJqhvqjmyTWNA9dEc+U4SVxU+jJfJMi7TiMC91E3DLWJSO 0E/qml89zqivNbqD3LZ/S5yLLChiS4aXUsI3KUzOnk8l7Dt2PzlfLWLAiCP8Kurd3L0w q9lg== Received: by 10.180.104.197 with SMTP id gg5mr30056301wib.9.1346757189621; Tue, 04 Sep 2012 04:13:09 -0700 (PDT) Received: from ogoshi.int.nbs-system.com (home.6dev.net. [88.191.118.8]) by mx.google.com with ESMTPS id fb20sm35519047wid.1.2012.09.04.04.13.07 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 04 Sep 2012 04:13:08 -0700 (PDT) Sender: Sofian Brabez Date: Tue, 4 Sep 2012 13:13:05 +0200 From: Sofian Brabez To: Julien Laffaye Message-ID: <20120904111305.GA10660@ogoshi.int.nbs-system.com> References: <4d8f38c1.581ce30a.1df5.63c3@mx.google.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="eJnRUKwClWJh1Khz" Content-Disposition: inline In-Reply-To: <4d8f38c1.581ce30a.1df5.63c3@mx.google.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: FreeBSD-gnats-submit@freebsd.org, python@FreeBSD.org Subject: Re: [PATCH] lang/python: speed up upgrade-site-packages 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: Tue, 04 Sep 2012 11:13:11 -0000 --eJnRUKwClWJh1Khz Content-Type: multipart/mixed; boundary="opJtzjQTFsWo+cga" Content-Disposition: inline --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Mar 27, 2011 at 06:16:49AM -0700, Julien Laffaye wrote: >=20 > >Submitter-Id: current-users > >Originator: Julien Laffaye > >Organization:=09 > >Confidential: no=20 > >Synopsis: [PATCH] lang/python: speed up upgrade-site-packages > >Severity: non-critical > >Priority: low > >Category: ports=20 > >Class: change-request > >Release: FreeBSD 8.2-RELEASE amd64 > >Environment: > System: FreeBSD chulak.lan 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17= 02:41:51 UTC 2011 > >Description: > Instead of asking each file in lib/python which package it comes from, as= k each package if it has a file in lib/python. > This speed things up significantly on my system. >=20 > Port maintainer (python@FreeBSD.org) is cc'd. >=20 > Generated with FreeBSD Port Tools 0.99 > >How-To-Repeat: > >Fix: >=20 > --- python-2.7,2.patch begins here --- > diff -ruN --exclude=3DCVS /usr/ports/lang/python.orig/Makefile /usr/ports= /lang/python/Makefile > --- /usr/ports/lang/python.orig/Makefile 2011-03-26 13:17:41.000000000 +0= 000 > +++ /usr/ports/lang/python/Makefile 2011-03-27 14:09:30.000000000 +0100 > @@ -25,15 +25,9 @@ > =20 > # Major upgrade support > PORTUPGRADE_CMD=3D ${LOCALBASE}/sbin/portupgrade > -PKG_WHICH_CMD=3D ${LOCALBASE}/sbin/pkg_which > -XARGS_CMD=3D ${XARGS} -0 > =20 > .if defined(USE_PORTMASTER) > PORTUPGRADE_CMD=3D ${LOCALBASE}/sbin/portmaster > -PORTUPGRADE_ARGS?=3D "" > -PKG_WHICH_CMD=3D /usr/sbin/pkg_info -qW > -JOBS=3D ${SYSCTL} -n kern.smp.cpus > -XARGS_CMD=3D ${XARGS} -L 1 -0 -P $$(${JOBS}) > .endif > =20 > upgrade-site-packages: > @@ -42,22 +36,21 @@ > ${FALSE}; \ > fi > =20 > - @for ver in `echo ${_PYTHON_ALLBRANCHES}|${SED} 's/${PYTHON_VER}//'`; d= o \ > - if [ -d ${PREFIX}/lib/python$$ver ]; then \ > - UPD=3D`${FIND} ${PREFIX}/lib/python$$ver \ > - -type f -print0 | \ > - ${XARGS_CMD} ${PKG_WHICH_CMD} | \ > - ${GREP} -Fv '?' | \ > - ${EGREP} -v '^python2?[0-5]?-2' | \ > - ${SORT} -u`; \ > - if [ "$$UPD" ]; then \ > - if [ -n ${PORTUPGRADE_ARGS} ]; then \ > - ${PORTUPGRADE_CMD} ${PORTUPGRADE_ARGS} -f $$UPD; \ > - else \ > - ${PORTUPGRADE_CMD} -f $$UPD; \ > - fi; \ > - fi; \ > + @GREP_ARGS=3D"-q"; \ > + for ver in `echo ${_PYTHON_ALLBRANCHES}|${SED} 's/${PYTHON_VER}//'`; do= \ > + GREP_ARGS=3D"$${GREP_ARGS} -e lib/python$$ver"; \ > + done; \ > + UPD=3D""; \ > + for pkg in `${PKG_INFO} -Ea`; do \ > + ${PKG_INFO} -L $${pkg} | ${GREP} $${GREP_ARGS} && \ > + UPD=3D"$${UPD} $${pkg}"; \ > + done; \ > + if [ "$${UPD}" ]; then \ > + if [ -n ${PORTUPGRADE_ARGS} ]; then \ > + ${PORTUPGRADE_CMD} ${PORTUPGRADE_ARGS} -f $${UPD}; \ > + else \ > + ${PORTUPGRADE_CMD} -f $${UPD}; \ > fi; \ > - done \ > + fi; \ > =20 > .include > --- python-2.7,2.patch ends here --- >=20 > _______________________________________________ > freebsd-python@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-python > To unsubscribe, send any mail to "freebsd-python-unsubscribe@freebsd.org" Hi, I rework on this patch to avoid the use of ${SED} and I'll ask for a exp-ru= n. My new patch is attached. Regards -- Sofian Brabez --opJtzjQTFsWo+cga-- --eJnRUKwClWJh1Khz Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlBF4kEACgkQc2NR9CSH5X5IuQCgiq6QfESbyCBN+3uwuyWTYBXX gYgAoIpVUgsylCYzPEx3WyT6n2dN7KtU =LCni -----END PGP SIGNATURE----- --eJnRUKwClWJh1Khz--