From owner-FreeBSD-users-jp@jp.freebsd.org  Mon Aug 20 15:31:59 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id PAA64737;
	Mon, 20 Aug 2001 15:31:59 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from mail.musha.org (postfix@daemon.musha.org [61.122.44.178])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id PAA64730;
	Mon, 20 Aug 2001 15:31:58 +0900 (JST)
	(envelope-from knu@iDaemons.org)
Received: from archon.local.idaemons.org (archon.local.idaemons.org [192.168.1.32])
	by mail.musha.org (Postfix) with ESMTP
	id 773AF4D801; Mon, 20 Aug 2001 15:31:53 +0900 (JST)
Date: Mon, 20 Aug 2001 15:31:53 +0900
Message-ID: <86ae0v5jja.wl@archon.local.idaemons.org>
From: "Akinori MUSHA" <knu@iDaemons.org>
To: Mamoru Iwaki <iwaki@bsp.bc.niigata-u.ac.jp>
Cc: FreeBSD-users-jp@jp.freebsd.org, ports-jp@jp.freebsd.org
In-Reply-To: <20010820060955.20389.qmail@pikachu.bsp.bc.niigata-u.ac.jp>
References: <86u1z5su4h.wl@archon.local.idaemons.org>
	<86pu9thebz.wl@archon.local.idaemons.org>
	<86g0ao2cv9.wl@archon.local.idaemons.org>
	<20010820060955.20389.qmail@pikachu.bsp.bc.niigata-u.ac.jp>
User-Agent: Wanderlust/2.7.2 (Too Funky) SEMI/1.14.3 (Ushinoya) FLIM/1.14.3
 (=?ISO-8859-1?Q?Unebigory=F2mae?=) APEL/10.3 MULE XEmacs/21.1 (patch 14)
 (Cuyahoga Valley) (i386--freebsd)
Organization: Associated I. Daemons
X-PGP-Public-Key: finger knu@FreeBSD.org
X-PGP-Fingerprint: 081D 099C 1705 861D 4B70  B04A 920B EFC7 9FD9 E1EE
MIME-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya")
Content-Type: text/plain; charset=ISO-2022-JP
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: FreeBSD-users-jp 63612
Subject: [FreeBSD-users-jp 63612] Re: [ANN] portupgrade-20010820
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org
X-Originator: knu@iDaemons.org

At Mon, 20 Aug 2001 15:09:56 +0900,
Mamoru Iwaki wrote:
> 081[678]$B$"$?$j$+$i!"0J2<$N$h$&$K$J$C$F$7$^$$$^$9!#!J0JA0$OF0$$$F$$$^(B
> $B$7$?!#!K$I$&$d$i(B-R$B$r;XDj$9$k$H%@%a$J$h$&$G$9!#(B
> 
> # portupgrade -acCrRx XFree'*'
> /usr/local/lib/ruby/site_ruby/1.6/pkgtools.rb:212:in `push': wrong # of arguments(at least 1) (ArgumentError)
>         from /usr/local/lib/ruby/site_ruby/1.6/pkgtools.rb:212:in `pkg_recurse'

$B!!$4Js9p$"$j$,$H$&$4$6$$$^$9!#D>@\$N%(%i!<$N860x$O3:Ev%k!<%A%s$N(B
$B%P%0$G$9$,!"4V@\E*$JMW0x$O!"$$$:$l$+$N%Q%C%1!<%8$NEPO?>pJs$NCf$K(B
$B5-O?$5$l$F$$$k0MB8%Q%C%1!<%8L>$,$9$Y$F<B:]$K$O%$%s%9%H!<%k$5$l$F(B
$B$$$J$$$b$N$G$"$C$?$?$a$H9M$($i$l$^$9!#(B

$B!!(Bpkgdepfix $B$rAv$i$;$A$c$&$H$3$l$,D>$C$F%(%i!<$b5/$-$J$/$J$C$F(B
$B$7$^$&$N$G!"Ja$^$($F$$$?$@$-46<U$7$^$9!#(B :)

$B!!=$@5$OE:IU$NDL$j!#$"$H$GJL$N=$@5$b4^$a$F99?7$7$^$9!#(B

-- 
                     /
                    /__  __            Akinori.org / MUSHA.org
                   / )  )  ) )  /     FreeBSD.org / Ruby-lang.org
Akinori MUSHA aka / (_ /  ( (__(  @ iDaemons.org / and.or.jp

"Freeze this moment a little bit longer, make each impression
  a little bit stronger..  Experience slips away -- Time stand still"

Index: pkgtools.rb
===================================================================
RCS file: /home/cvs/pkgtools/pkgtools.rb,v
retrieving revision 1.14
diff -u -u -r1.14 pkgtools.rb
--- pkgtools.rb	18 Aug 2001 09:55:20 -0000	1.14
+++ pkgtools.rb	20 Aug 2001 06:29:34 -0000
@@ -208,8 +208,10 @@
   if recurse_up
     deps = $pkgdb.pkgdep(pkgname)
 
-    if deps && !deps.empty?
-      list.push *(deps.select { |pkgname| $pkgdb.installed?(pkgname) })
+    if deps
+      deps.reject! { |pkgname| !$pkgdb.installed?(pkgname) }
+
+      list.push(*deps) unless deps.empty?
     end
   end
 
@@ -218,8 +220,10 @@
   if recurse_down
     deps = $pkgdb.required_by(pkgname)
 
-    if deps && !deps.empty?
-      list.push *(deps.select { |pkgname| $pkgdb.installed?(pkgname) })
+    if deps
+      deps.reject! { |pkgname| !$pkgdb.installed?(pkgname) }
+
+      list.push(*deps) unless deps.empty?
     end
   end
 
