From 69ec329aa4ef1c0fcdbfa3f21e0d1da2879c728c Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Sat, 7 Jan 2006 01:04:28 +0000 Subject: sysutils/portupgrade: Fix yet another infinite loop. Check and avoid infinite loop when MOVED has an entry such as: games/scummvm|emulators/scummvm|2004-04-06|new category emulators/scummvm|games/scummvm|2004-04-13|new category (games/scummvm -> emulators/scummvm -> games/scummvm -> ...) Reported by: Bohdan Horst PR: ports/91402 Submitted by: KOMATSU Shinichiro --- ports-mgmt/portupgrade-devel/Makefile | 2 +- ports-mgmt/portupgrade-devel/files/patch-lib-portsdb.rb | 13 +++++++++++++ ports-mgmt/portupgrade/Makefile | 2 +- ports-mgmt/portupgrade/files/patch-lib-portsdb.rb | 13 +++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 ports-mgmt/portupgrade-devel/files/patch-lib-portsdb.rb create mode 100644 ports-mgmt/portupgrade/files/patch-lib-portsdb.rb (limited to 'ports-mgmt') diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index bf0fdbc7e68d..9e95e5d7da78 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.0.1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= http://dists.lovepeers.org/distfiles/portupgrade/ diff --git a/ports-mgmt/portupgrade-devel/files/patch-lib-portsdb.rb b/ports-mgmt/portupgrade-devel/files/patch-lib-portsdb.rb new file mode 100644 index 000000000000..3d3278148e18 --- /dev/null +++ b/ports-mgmt/portupgrade-devel/files/patch-lib-portsdb.rb @@ -0,0 +1,13 @@ +Index: lib/portsdb.rb +=================================================================== +--- lib/portsdb.rb (revision 74) ++++ lib/portsdb.rb (revision 75) +@@ -91,7 +91,7 @@ + while true + if moved = @moved[me] + t << moved if t.empty? or t.last.seq < moved.seq +- if me.nil? or me == moved.to ++ if me.nil? or t.map{|p| p.to}.include?(me) + break + else + me = moved.to diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index bf0fdbc7e68d..9e95e5d7da78 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -7,7 +7,7 @@ PORTNAME= portupgrade PORTVERSION= 2.0.1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= http://dists.lovepeers.org/distfiles/portupgrade/ diff --git a/ports-mgmt/portupgrade/files/patch-lib-portsdb.rb b/ports-mgmt/portupgrade/files/patch-lib-portsdb.rb new file mode 100644 index 000000000000..3d3278148e18 --- /dev/null +++ b/ports-mgmt/portupgrade/files/patch-lib-portsdb.rb @@ -0,0 +1,13 @@ +Index: lib/portsdb.rb +=================================================================== +--- lib/portsdb.rb (revision 74) ++++ lib/portsdb.rb (revision 75) +@@ -91,7 +91,7 @@ + while true + if moved = @moved[me] + t << moved if t.empty? or t.last.seq < moved.seq +- if me.nil? or me == moved.to ++ if me.nil? or t.map{|p| p.to}.include?(me) + break + else + me = moved.to -- cgit v1.2.3