diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-02 11:03:25 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-02 11:03:25 +0000 |
| commit | 1d2994d56bbad24e8841f1e274de0c917322c7e0 (patch) | |
| tree | 02e1c176dd2bd25a18f3ab99d588620e98a7d892 /ports-mgmt | |
| parent | 16d5ee5671899381c74e896863480aa46dedfe7a (diff) | |
| download | freebsd-ports-1d2994d56bbad24e8841f1e274de0c917322c7e0.zip | |
Problem with portupgrade 2.0
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?
PR: ports/91209
Submitted by: KOMATSU Shinichiro <koma2@lovepeers.org>
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portupgrade-devel/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade-devel/files/patch-lib-portsdb.rb | 16 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portupgrade/files/patch-lib-portsdb.rb | 16 |
4 files changed, 34 insertions, 2 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile index ad357afea681..c4ec8d5e9e33 100644 --- a/ports-mgmt/portupgrade-devel/Makefile +++ b/ports-mgmt/portupgrade-devel/Makefile @@ -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 --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..2a7d989170ae --- /dev/null +++ b/ports-mgmt/portupgrade-devel/files/patch-lib-portsdb.rb @@ -0,0 +1,16 @@ +--- lib/portsdb.rb.orig Mon Jan 2 21:58:23 2006 ++++ lib/portsdb.rb Mon Jan 2 21:58:55 2006 +@@ -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 diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile index ad357afea681..c4ec8d5e9e33 100644 --- a/ports-mgmt/portupgrade/Makefile +++ b/ports-mgmt/portupgrade/Makefile @@ -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 --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..2a7d989170ae --- /dev/null +++ b/ports-mgmt/portupgrade/files/patch-lib-portsdb.rb @@ -0,0 +1,16 @@ +--- lib/portsdb.rb.orig Mon Jan 2 21:58:23 2006 ++++ lib/portsdb.rb Mon Jan 2 21:58:55 2006 +@@ -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 |