Date: Sun, 5 Feb 2012 11:10:12 GMT From: Jason Taylor <jason@infinitebubble.com> To: ruby@FreeBSD.org Subject: Re: ports/140273: ports-mgmt/portupgrade-devel chokes on bsdpan pkgs Message-ID: <201202051110.q15BACQi088123@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/140273; it has been noted by GNATS. From: Jason Taylor <jason@infinitebubble.com> To: Steve Wills <swills@FreeBSD.org>, bug-followup@FreeBSD.org Cc: Subject: Re: ports/140273: ports-mgmt/portupgrade-devel chokes on bsdpan pkgs Date: Sun, 5 Feb 2012 05:43:18 -0500 --20cf307f35bac49aa604b83536f6 Content-Type: text/plain; charset=ISO-8859-1 Hi, using the current portupgrade-devel, I was able to get it to working with just a one line change using Ruby 1.8. I think it'd work for Ruby 1.9 too. I had some, I think, unrelated encoding issues trying to rewrite +CONTENTS files using 1.9. --- /usr/ports/ports-mgmt/portupgrade-devel/work/pkgtools-9999/bin/portupgrade 2011-11-19 04:06:56.000000000 -0500 +++ /usr/local/sbin/portupgrade 2012-02-05 05:02:33.000000000 -0500 @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/local/bin/ruby18 # -*- ruby -*- # # Copyright (c) 2000-2004 Akinori MUSHA @@ -997,7 +997,7 @@ end end - $results << PkgResult.new(origin, result ? :done : :ignored, pkgname) + $results << PkgResult.new(origin ? origin : "", result ? :done : :ignored, pkgname) rescue IgnoreMarkError => e $results << PkgResult.new(origin, :ignored, pkgname) rescue => e --20cf307f35bac49aa604b83536f6 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi, using the current portupgrade-devel, I was able to get it to working wi= th just a one line change using Ruby 1.8. =A0I think it'd work for Ruby= 1.9 too. =A0I had some, I think, unrelated encoding issues trying to rewri= te +CONTENTS files using 1.9.<div> <br></div><div><div>--- /usr/ports/ports-mgmt/portupgrade-devel/work/pkgtoo= ls-9999/bin/portupgrade<span class=3D"Apple-tab-span" style=3D"white-space:= pre"> </span>2011-11-19 04:06:56.000000000 -0500</div><div>+++ /usr/local/s= bin/portupgrade<span class=3D"Apple-tab-span" style=3D"white-space:pre"> </= span>2012-02-05 05:02:33.000000000 -0500</div> <div>@@ -1,4 +1,4 @@</div><div>-#!/usr/bin/env ruby</div><div>+#!/usr/local= /bin/ruby18</div><div>=A0# -*- ruby -*-</div><div>=A0#</div><div>=A0# Copyr= ight (c) 2000-2004 Akinori MUSHA</div><div>@@ -997,7 +997,7 @@</div><div>= =A0 =A0 =A0 =A0end</div> <div>=A0 =A0 =A0end</div><div>=A0</div><div>- =A0 =A0$results << PkgR= esult.new(origin, result ? :done : :ignored, pkgname)</div><div>+ =A0 =A0$r= esults << PkgResult.new(origin ? origin : "", result ? :don= e : :ignored, pkgname)</div> <div>=A0 =A0rescue IgnoreMarkError =3D> e</div><div>=A0 =A0 =A0$results = << PkgResult.new(origin, :ignored, pkgname)</div><div>=A0 =A0rescue = =3D> e</div></div><div><br></div> --20cf307f35bac49aa604b83536f6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202051110.q15BACQi088123>