Date: Tue, 30 May 2006 16:39:30 +0200 (CEST) From: Anton Berezin <tobez@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/98153: Fix a small buglet in sysutils/portupgrade Message-ID: <20060530143930.2CC34125439@heechee.tobez.org> Resent-Message-ID: <200605301440.k4UEeTs2053258@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98153 >Category: ports >Synopsis: Fix a small buglet in sysutils/portupgrade >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue May 30 14:40:28 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Anton Berezin >Release: FreeBSD 6.0-STABLE amd64 >Organization: >Environment: System: FreeBSD heechee.tobez.org 6.0-STABLE FreeBSD 6.0-STABLE #2: Tue Jan 10 17:46:02 CET 2006 root@heechee.tobez.org:/usr/obj/usr/src/sys/TU4A amd64 >Description: In case of multiple origin change, when the resulting origin is the same as the original origin, portupgrade still produces a warning. Please see the following IRC conversation for details: < roth__> ** Package origin of 'pan' has been changed: 'news/pan' -> 'news/pan' < roth__> ? < roth__> persists after portupgrade -f <@Grrrr> news/pan|news/pan2|2003-11-03|Stable release can be found in news/pan2 <@Grrrr> news/pan2|news/pan|2006-05-28|Use unversioned name <@Grrrr> hmm? < roth__> hehe < roth__> makes sense though, to go back to unversioned, once that becomes stable <@Grrrr> yes, the bitching is understandable, but wrong <@arved> i think we had this before with a port, and removed the old MOVED line <@Grrrr> arved, hmm, would not it be more correct to fix the offender to not produce those messages? < roth__> more correct? <@arved> hehe :-), nobody likes touching portupgrade <@Grrrr> sounds like a really trivial fix <@linimon_> it seems as though the canonical solution these days is to remove those two lines from MOVED. <@Grrrr> two would be wrong for those who still has news/pan2 installed <@linimon_> I'm not saying that I like that solution. <@linimon_> the first line sounds like it should go, though. <@Grrrr> http://rafb.net/paste/results/1qIGfC58.txt <@Grrrr> roth__: can you test that it fixes it? < roth__> ok, hold on < roth__> Grrrr: no more complaining >How-To-Repeat: >Fix: The patch below can be applied either "upstream", or to the port itself, I'll let the maintainer to decide. --- ./pkgtools-2.0.1/bin/portupgrade.orig Tue May 30 16:27:15 2006 +++ ./pkgtools-2.0.1/bin/portupgrade Tue May 30 16:29:40 2006 @@ -730,7 +730,9 @@ def do_upgrade(pkgname) !config_ignore_moved?(pkg) and \ (moved = $portsdb.moved.trace(pkg.origin)) if origin = moved.last.to - warning_message "Package origin of '#{pkg.name}' has been changed: '#{pkg.origin}' -> '#{origin}'" + if pkg.origin != origin + warning_message "Package origin of '#{pkg.name}' has been changed: '#{pkg.origin}' -> '#{origin}'" + end else warning_message "Package '#{pkg.name}' has been removed from ports tree." end >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060530143930.2CC34125439>