diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-07 01:04:28 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-07 01:04:28 +0000 |
| commit | 69ec329aa4ef1c0fcdbfa3f21e0d1da2879c728c (patch) | |
| tree | f503bbd32b47be96c8ee8e4a8efceeadea6ec01b /ports-mgmt/portupgrade | |
| parent | [Maintainer-Update] multimedia/qdvdauthor 0.1.0 (diff) | |
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 <nexus at hoth dot amu dot edu dot pl>
PR: ports/91402
Submitted by: KOMATSU Shinichiro <koma2@lovepeers.org>
Notes
Notes:
svn path=/head/; revision=152930
Diffstat (limited to 'ports-mgmt/portupgrade')
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-lib-portsdb.rb | 13 |
2 files changed, 14 insertions, 1 deletions
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 |