From owner-freebsd-ruby@FreeBSD.ORG Sun Feb 5 11:10:13 2012 Return-Path: Delivered-To: ruby@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 19C65106566C for ; Sun, 5 Feb 2012 11:10:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E27A88FC15 for ; Sun, 5 Feb 2012 11:10:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q15BACpY088124 for ; Sun, 5 Feb 2012 11:10:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q15BACQi088123; Sun, 5 Feb 2012 11:10:12 GMT (envelope-from gnats) Date: Sun, 5 Feb 2012 11:10:12 GMT Message-Id: <201202051110.q15BACQi088123@freefall.freebsd.org> To: ruby@FreeBSD.org From: Jason Taylor Cc: Subject: Re: ports/140273: ports-mgmt/portupgrade-devel chokes on bsdpan pkgs X-BeenThere: freebsd-ruby@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jason Taylor List-Id: FreeBSD-specific Ruby discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2012 11:10:13 -0000 The following reply was made to PR ports/140273; it has been noted by GNATS. From: Jason Taylor To: Steve Wills , 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.

--- /usr/ports/ports-mgmt/portupgrade-devel/work/pkgtoo= ls-9999/bin/portupgrade 2011-11-19 04:06:56.000000000 -0500
+++ /usr/local/s= bin/portupgrade 2012-02-05 05:02:33.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/local= /bin/ruby18
=A0# -*- ruby -*-
=A0#
=A0# Copyr= ight (c) 2000-2004 Akinori MUSHA
@@ -997,7 +997,7 @@
= =A0 =A0 =A0 =A0end
=A0 =A0 =A0end
=A0
- =A0 =A0$results << PkgR= esult.new(origin, result ? :done : :ignored, pkgname)
+ =A0 =A0$r= esults << PkgResult.new(origin ? origin : "", result ? :don= e : :ignored, pkgname)
=A0 =A0rescue IgnoreMarkError =3D> e
=A0 =A0 =A0$results = << PkgResult.new(origin, :ignored, pkgname)
=A0 =A0rescue = =3D> e

--20cf307f35bac49aa604b83536f6--