Date: Mon, 2 Jan 2006 12:20:12 GMT From: Darin <derwood@naebunny.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/91209: Problem with portupgrade 2.0 Message-ID: <200601021220.k02CKCxH045198@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/91209; it has been noted by GNATS. From: Darin <derwood@naebunny.net> To: KOMATSU Shinichiro <koma2@lovepeers.org> Cc: bug-followup@FreeBSD.org, edwin@FreeBSD.org Subject: Re: ports/91209: Problem with portupgrade 2.0 Date: Mon, 02 Jan 2006 07:16:10 -0500 The fix worked perfectly.. Thanks a million! Darin - KOMATSU Shinichiro wrote: >Thank you for reporting. I also discovered this problem a few hours ago. > >The source of this trouble is that the following line exists in MOVED, > > lang/php4|lang/php4|2003-05-22|re-separated from www/mod_php4 > >where "moved from" and "moved to" is the same, >but portupgrade does not check this case and infinite loop occurs. > >Fix to this problem will be in the next portupgrade release, >but in the meanwhile, whould you commit the following patch, please? > >Thanks. > > >diff --exclude=CVS --exclude=*.log* -urN portupgrade.old/Makefile portupgrade/Makefile >--- portupgrade.old/Makefile Mon Jan 2 00:43:35 2006 >+++ portupgrade/Makefile Mon Jan 2 19:32:09 2006 >@@ -7,7 +7,7 @@ > > PORTNAME= portupgrade > PORTVERSION= 2.0.0 >-PORTREVISION= 0 >+PORTREVISION= 1 > PORTEPOCH= 1 > CATEGORIES= sysutils > MASTER_SITES= http://dists.lovepeers.org/distfiles/portupgrade/ >diff --exclude=CVS --exclude=*.log* -urN portupgrade.old/files/patch-lib-portsdb.rb portupgrade/files/patch-lib-portsdb.rb >--- portupgrade.old/files/patch-lib-portsdb.rb Thu Jan 1 09:00:00 1970 >+++ portupgrade/files/patch-lib-portsdb.rb Mon Jan 2 19:31:29 2006 >@@ -0,0 +1,18 @@ >+Index: lib/portsdb.rb >+=================================================================== >+--- lib/portsdb.rb (revision 54) >++++ lib/portsdb.rb (revision 59) >+@@ -87,8 +87,11 @@ >+ while true >+ if moved = @moved[me] >+ t << moved >+- me = moved.to >+- break if me.nil? >++ if me.nil? or me == moved.to >++ break >++ else >++ me = moved.to >++ end >+ else >+ break >+ end > > >!DSPAM:43b9077f21913682442798! > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601021220.k02CKCxH045198>