ports/140273: ports-mgmt/portupgrade-devel chokes on bsdpan pkgs

[Steve Wills]

The following reply was made to PR ports/140273; it has been noted by GNATS.

From: Steve Wills <swills at FreeBSD.org>
To: Fabian Wenk <fabian at wenks.ch>
Cc: ruby at FreeBSD.org, bug-followup at FreeBSD.org
Subject: Re: ports/140273: ports-mgmt/portupgrade-devel chokes on bsdpan pkgs
Date: Sun, 21 Aug 2011 14:18:00 -0400

 This is a multi-part message in MIME format.
 --------------060004000008050006070608
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 On 08/21/11 13:30, Fabian Wenk wrote:
 > The following reply was made to PR ports/140273; it has been noted by GNATS.
 > 
 > From: Fabian Wenk <fabian at wenks.ch>
 > To: bug-followup at FreeBSD.org
 > Cc: dokas at oitsec.umn.edu
 > Subject: Re: ports/140273: ports-mgmt/portupgrade-devel chokes on bsdpan pkgs
 > Date: Sun, 21 Aug 2011 19:21:47 +0200
 > 
 >  Hello
 >  
 >  This is still not fixed even with portupgrade-2.4.9,2 and gives 
 >  the same error. I'm running on FreeBSD 7.3-RELEASE-p4 amd64. All 
 >  Ports are current as of today.
 >  
 >  root at batman:/usr/ports# portupgrade -an
 >  --->  Session started at: Sun, 21 Aug 2011 18:24:39 +0200
 >  --->  Skipping 'bsdpan-Bot-Pastebot-0.52' because it is held by 
 >  user (specify -f to force)
 >  --->  Session ended at: Sun, 21 Aug 2011 18:25:21 +0200 (consumed 
 >  00:00:41)
 >  /usr/local/lib/ruby/site_ruby/1.9/pkgtools.rb:953:in `initialize': 
 >  ArgumentError (ArgumentError)
 >  	from /usr/local/sbin/portupgrade:1004:in `new'
 >  	from /usr/local/sbin/portupgrade:1004:in `rescue in do_upgrade'
 >  	from /usr/local/sbin/portupgrade:1007:in `do_upgrade'
 >  	from /usr/local/sbin/portupgrade:814:in `block (2 levels) in main'
 >  	from /usr/local/sbin/portupgrade:810:in `each'
 >  	from /usr/local/sbin/portupgrade:810:in `block in main'
 >  	from /usr/local/lib/ruby/1.9/optparse.rb:799:in `initialize'
 >  	from /usr/local/sbin/portupgrade:231:in `new'
 >  	from /usr/local/sbin/portupgrade:231:in `main'
 >  	from /usr/local/sbin/portupgrade:2219:in `<main>'
 >  root at batman:/usr/ports#
 >  
 
 If you're using Ruby 1.9, give this patch a try.
 
 Steve
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (FreeBSD)
 
 iQEcBAEBAgAGBQJOUUvYAAoJEPXPYrMgexuh/iEH+gO4wKP1OaLsH0cjM/6DUwMJ
 EaMsYcBude/U2F6zH6bWxq7zYFO0P489CSCNXELGlfHsdsqww/f59F6PFsHSyA1a
 GVNwrq5tUB5LqCthXlx78WSn7Qtk0xl7CXAplU+PUje/RXzwYvlv9mD1/ozNRrSV
 sA2IqZaGZIBxoHDwaIJ+k84AcMGaSrnJH8elyO7KSXdlBAUxJnmUfgCBAqtrn4St
 rnOc5brWpU0rcjnoJr++7cBlhrhFH33cPJj8rP0DUbkIlN7AdE61lifngIx76OjP
 LdpOE19nX1AJk717Ojr6pvHNmLt37ze7Z3FIWIRKf0KWSmpqxHGozW6BiVvgxRI=
 =YJEr
 -----END PGP SIGNATURE-----
 
 --------------060004000008050006070608
 Content-Type: text/plain;
  name="patch-1.9"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-1.9"
 
 --- lib/pkgmisc.rb.orig	2011-08-21 10:15:39.000000000 +0000
 +++ lib/pkgmisc.rb	2011-08-21 10:15:45.000000000 +0000
 @@ -28,8 +28,8 @@
  # $FreeBSD: projects/pkgtools/lib/pkgmisc.rb,v 1.12 2011-07-25 12:34:43 swills Exp $
  
  begin
 -  require 'features/ruby18/dir'	# for Dir.chdir(dir) { ... }
 -  require 'features/ruby18/enum' # Enumerable#any?, etc.
 +  require 'features/ruby19/dir'	# for Dir.chdir(dir) { ... }
 +  require 'features/ruby19/enum' # Enumerable#any?, etc.
  rescue LoadError
  end
  
 @@ -100,12 +100,6 @@
    }.join(' ')
  end
  
 -class File
 -  def File.realpath(path)
 -    return File.expand_path(path)
 -  end
 -end
 -
  def init_tmpdir
    if ! $tmpdir.nil? && $tmpdir != "" then
      return
 --- bin/portupgrade.orig	2011-08-21 11:46:59.000000000 +0000
 +++ bin/portupgrade	2011-08-21 11:47:06.000000000 +0000
 @@ -634,7 +634,7 @@
  		  get_all_depends(origin).each do |d|
  		    newdep = $pkgdb.deorigin(d)
  		    unless newdep.nil? then
 -		      dep << newdep.to_s
 +		      dep << newdep.join
  		    end
  		  end
  		  depends |= dep if $upward_recursive
 @@ -995,6 +995,10 @@
  	  $package_tasks << key if deps.include?(pkgname)
  	end
        end
 +    else
 +      # maybe held?
 +      upgraded = false
 +      return false
      end
  
      $results << PkgResult.new(origin, result ? :done : :ignored, pkgname)
 
 --------------060004000008050006070608
 Content-Type: application/octet-stream;
  name="patch-1.9.sig"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment;
  filename="patch-1.9.sig"
 
 iQEcBAABAgAGBQJOUUvYAAoJEPXPYrMgexuh1HwH/if5RA4b4RRAjsHEkWFqr7gHCYJ72+MX
 zAWMXHVsxdiDWi8kEix5BStbwUI1cT01aMT/nc17fpXNSClzHBe8FbwkJ5SC4C+HdZs3cU9s
 SKH7nKjHbUIMRgUrxETyLa+9dQt+Pr5377QR4c+Xvdmt5IVkk+aY3gQ+uG1xbREvNPJRgRpn
 GJt0Zd/SNR/3evlLof0ymYhE5ZR+qqXwK//xyah0wfQAOzZknIF1QQHkkj4KUVDYUWqQEpyj
 PPUfDOpw0GEmV9Wvi+ftHFfRMbqnzpo46zupa40Akayx/T+BnL7Ftwl5BiAbndLVDylZB0/7
 cswy2QTr1RBlgEB0vfIvmY8=
 --------------060004000008050006070608--