From owner-freebsd-ruby@FreeBSD.ORG Sat Feb 26 08:07:17 2011 Return-Path: Delivered-To: freebsd-ruby@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC5B2106564A for ; Sat, 26 Feb 2011 08:07:17 +0000 (UTC) (envelope-from milki@rescomp.berkeley.edu) Received: from hal.rescomp.berkeley.edu (hal.Rescomp.Berkeley.EDU [169.229.70.150]) by mx1.freebsd.org (Postfix) with ESMTP id 9DD578FC12 for ; Sat, 26 Feb 2011 08:07:17 +0000 (UTC) Received: by hal.rescomp.berkeley.edu (Postfix, from userid 1070) id 2CB33119DA6; Fri, 25 Feb 2011 23:49:20 -0800 (PST) Date: Fri, 25 Feb 2011 23:49:19 -0800 From: milki To: freebsd-ruby@FreeBSD.org Message-ID: <20110226074919.GE64811@hal.rescomp.berkeley.edu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="mSxgbZZZvrAyzONB" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Subject: portupgrade results listing shows old port version X-BeenThere: freebsd-ruby@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD-specific Ruby discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 08:07:17 -0000 --mSxgbZZZvrAyzONB Content-Type: multipart/mixed; boundary="GPJrCs/72TxItFYR" Content-Disposition: inline --GPJrCs/72TxItFYR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, I've been wondering for a while, but after a successful portupgrade, the port version listed is the old version: ---> Upgrade of devel/git started at: Fri, 25 Feb 2011 23:44:50 -0800 ---> Upgrading 'git-1.7.3.5' to 'git-1.7.4.1' (devel/git) =2E.. ---> Upgrade of devel/git ended at: Fri, 25 Feb 2011 23:46:57 -0800 (consu= med 00:02:06) ---> ** Upgrade tasks 1: 1 done, 0 ignored, 0 skipped and 0 failed ---> Listing the results (+:done / -:ignored / *:skipped / !:failed) + devel/git (git-1.7.3.5) ---> Packages processed: 1 done, 0 ignored, 0 skipped and 0 failed Would it make more sense to specify the new port version in the listing results page? I've attached a patch proposal that pulls the new port version instead. --=20 milki milki@rescomp.berkeley.edu RSSP-IT programmers --GPJrCs/72TxItFYR Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-bin-portupgrade Content-Transfer-Encoding: quoted-printable --- bin/portupgrade.orig 2010-11-23 12:29:20.000000000 -0800 +++ bin/portupgrade 2011-02-25 23:27:29.000000000 -0800 @@ -952,10 +952,16 @@ end =20 if origin + portpkgname =3D check_pkgname(origin) # raises CommandFailedError + else + portpkgname =3D pkgname + end + + if origin if result =3D $results[origin] - progress_message "Skipping '#{origin}' (#{pkgname}) because it has a= lready #{result.phrase(true)}" + progress_message "Skipping '#{origin}' (#{portpkgname}) because it h= as already #{result.phrase(true)}" =20 - $results << PkgResult.new(origin, :skipped, pkgname) + $results << PkgResult.new(origin, :skipped, portpkgname) return elsif !$keep_going deps =3D pkg.pkgdep || [] @@ -966,8 +972,8 @@ result =3D $results[o] =20 if result && result.failed? - progress_message "Skipping '#{origin}' (#{pkgname}) because a requisite= package '#{dep}' (#{o}) failed (specify -k to force)" - $results << PkgResult.new(origin, :skipped, pkgname) + progress_message "Skipping '#{origin}' (#{portpkgname}) because a requi= site package '#{dep}' (#{o}) failed (specify -k to force)" + $results << PkgResult.new(origin, :skipped, portpkgname) return end end @@ -997,11 +1003,11 @@ end end =20 - $results << PkgResult.new(origin, result ? :done : :ignored, pkgname) + $results << PkgResult.new(origin, result ? :done : :ignored, portpkgna= me) rescue IgnoreMarkError =3D> e - $results << PkgResult.new(origin, :ignored, pkgname) + $results << PkgResult.new(origin, :ignored, portpkgname) rescue =3D> e - $results << PkgResult.new(origin, e, pkgname) + $results << PkgResult.new(origin, e, portpkgname) ensure $use_packages, $use_packages_only =3D use_packages, use_packages_only end @@ -1013,7 +1019,7 @@ =20 $pkgdb.autofix =20 - progress_message "Packaging '#{pkgname}' as dependency" + progress_message "Packaging '#{portpkgname}' as dependency" =20 if $noexecute puts "OK? [no]" if $interactive --GPJrCs/72TxItFYR-- --mSxgbZZZvrAyzONB Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iQEcBAEBAgAGBQJNaLB/AAoJEFEOn02jGA1hwgIH/AsFs9fkKkemXP1LWHijDfVX IjB/mMvAGjoJEmhrpMjKUpDKBKFiUtQx7yOuW21jWDxSt3FWn1T338ziK/EqoG9V DHHOvSpfhB6LJNFbYrg0rS88TKa0DUl6QvIqdAkO/ONagLYPpUlwdwkd0oH1p2cl sz544+Epdiq8vchBKZsM9N1kLjGqL5C1+Znih58TMx/KzRchyHj3t08DAx5T888S qoi7qxj3vjJF287GqlUJfK1i2qT238Mv54EHP0w8V6dCQ678IRKxNMS8nh3hxkFM OgbvlHq+byG2DgrcMA5FaPlL1xVp/tUnfAMBwaK+8Pdzv6MhGxOyQS9YOPGqBHs= =P9IO -----END PGP SIGNATURE----- --mSxgbZZZvrAyzONB--