Date: Sun, 21 Aug 2011 14:51:12 -0400 From: Steve Wills <swills@FreeBSD.org> To: Fabian Wenk <fabian@wenks.ch> Cc: ruby@FreeBSD.org, bug-followup@FreeBSD.org Subject: Re: ports/140273: ports-mgmt/portupgrade-devel chokes on bsdpan pkgs Message-ID: <4E5153A0.6040904@FreeBSD.org> In-Reply-To: <4E514BD8.4000603@FreeBSD.org> References: <201108211730.p7LHUB0Y082104@freefall.freebsd.org> <4E514BD8.4000603@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------000804010800030109010504 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/21/11 14:18, Steve Wills wrote: > 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@wenks.ch> >> To: bug-followup@FreeBSD.org >> Cc: dokas@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@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@batman:/usr/ports# > > > If you're using Ruby 1.9, give this patch a try. > > Steve > Replying to myself, but here are patches which may fix the issue even with Ruby 1.8. Please give them a try. Just mkdir /usr/ports/ports-mgmt/portupgrade/files then drop these into that dir then reinstall portupgrade. Steve -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (FreeBSD) iQEcBAEBAgAGBQJOUVOfAAoJEPXPYrMgexuhbbkH/AkZJNPtUeg0IlUuZgtPgdll 6RdUiYCXPXc5eJyA6MIy+VCYV1QwVdDTvUcG73PKHXdHvZEfeI3gEBu2gv3+2U3k etqz3locNO3cweU/f0OUCtlkMVBSYjGIJahZ4aphMKjaKH589aQy/06fVD2BqehD ElrqLgwtwpAIE3I0IfVODaUv/IAd4GHJH98gRpiEoRQiMDySbl9Pr+mN9F4QJrnd /ktP3WZuKwOIj7OEtugtkOyK1Sk0zfgbOaGPHfLy+49++e8dKjNCGgnpXOnTRBEI PdOOHl3j8wCWWS016v9svEmFDrz47cdR3SK+bNvlga1rXSaW/7SCyWHWo7ZVR+4= =yGdC -----END PGP SIGNATURE----- --------------000804010800030109010504 Content-Type: text/plain; name="patch-lib__portsdb.rb" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-lib__portsdb.rb" --- ./lib/portsdb.rb.orig 2011-08-21 14:38:09.000000000 +0000 +++ ./lib/portsdb.rb 2011-08-21 14:38:42.000000000 +0000 @@ -31,7 +31,7 @@ require 'singleton' require 'tempfile' begin - require 'features/ruby18/file' + require 'features/file' rescue LoadError; end require 'pkgmisc' require 'pkgdbtools' --------------000804010800030109010504 Content-Type: text/plain; name="patch-lib__pkginfo.rb" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-lib__pkginfo.rb" --- ./lib/pkginfo.rb.orig 2008-01-08 11:32:27.000000000 +0000 +++ ./lib/pkginfo.rb 2011-08-21 14:39:13.000000000 +0000 @@ -30,7 +30,7 @@ require 'pkgdb' require 'pkgversion' begin - require 'features/ruby18/file' + require 'features/file' rescue LoadError; end class PkgInfo --------------000804010800030109010504 Content-Type: text/plain; name="patch-lib__pkgmisc.rb" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-lib__pkgmisc.rb" --- ./lib/pkgmisc.rb.orig 2011-08-21 14:39:13.000000000 +0000 +++ ./lib/pkgmisc.rb 2011-08-21 14:40:57.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/dir' # for Dir.chdir(dir) { ... } + require 'features/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 --------------000804010800030109010504 Content-Type: text/plain; name="patch-lib__pkgtools.rb" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-lib__pkgtools.rb" --- ./lib/pkgtools.rb.orig 2011-08-21 14:37:50.000000000 +0000 +++ ./lib/pkgtools.rb 2011-08-21 14:38:38.000000000 +0000 @@ -31,8 +31,8 @@ Version = "2.4.9" begin - require 'features/ruby18/file' - require 'features/ruby18/enumerable' + require 'features/file' + require 'features/enumerable' rescue LoadError if !File.respond_to?(:fnmatch?) if ENV['RUBY_STATIC'] --------------000804010800030109010504 Content-Type: text/plain; name="patch-bin__portupgrade" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-bin__portupgrade" --- ./bin/portupgrade.orig 2011-07-25 12:34:43.000000000 +0000 +++ ./bin/portupgrade 2011-08-21 14:39:13.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) --------------000804010800030109010504 Content-Type: application/octet-stream; name="patch-lib__portsdb.rb.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch-lib__portsdb.rb.sig" iQEcBAABAgAGBQJOUVOfAAoJEPXPYrMgexuhbYMIAI0VXhPdl6gi6zQNNrMfLbTdmDIvmvtl zNOmGKRNH7MPfBJ9EORmY/GmyMwMhggwAuxt80n03RuY1lqVkkINnWSh86bJDays5daagqa3 h8HE+U2zjhAMwyZiBgX5sL/fnLf13gDDovFQmqq0ZRwzo+t34n5okDF/KYPodVI8FaGYXpu6 FbZ1xmSpkNwBoQ6BTaGdxFCqar+wL9VLfNJc8ljf4QUocQQoqQC566XmcB/ExJh9bNF9wo0F PNg2HuhxOUg47ROQWbeya7vqjb4Zxogn5bDS8r5IWkpk2AZ70dr4hSJph70asSqrHF/eOftr 9vZ4PRn6alXOgfgEUQYIqtY= --------------000804010800030109010504 Content-Type: application/octet-stream; name="patch-lib__pkginfo.rb.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch-lib__pkginfo.rb.sig" iQEcBAABAgAGBQJOUVOfAAoJEPXPYrMgexuhgVwIAIZv5g5peb+i38rRN9b8MmvB5f6ZrbX7 JoYxY8A0S933mhw3snxHX9XdGgjOmmzJwN95TmjMAN8YIOuU5Sn+aMtV9Dph4hRZKiQ/UVuA OpKdDmjQoC/iZw0oNHmpU0daUV90uC+zx2GdzL6Ml9sFVQVyX6zEerNH7cxlg6owsxIKZFyA s/JsJVO43Lw7pIZE86jZue7cvWJFwz6GPkUacn2L83JIRWGTEKQ549go2S2dPAuozGvrKWz8 sXH2z2a4OUcmhIC+tPUd31xrhHB/+oExuh77bq/MDisZ4eOpl9X1Bg2vG8aKlZrP8m9zxQOG xn4yBe0pmrWqzFC787ivePk= --------------000804010800030109010504 Content-Type: application/octet-stream; name="patch-lib__pkgmisc.rb.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch-lib__pkgmisc.rb.sig" iQEcBAABAgAGBQJOUVOgAAoJEPXPYrMgexuhAOoH/1ewLyPOhI4L9aiLHv/hs4vCm+it7IEc Zbo+xIhqAsXsvZEMn8Coq/AX/8soQL/YbmrvnS5dmSMhSwTjk5LIJmF0zmzizCBv0Z8LdUiK 6M+j1GBTLuD9qH1TlYZRSLEh9qLfh5ELhGnzIWhvIWpG6IoKiltYo2cG6iak9uUxnuV7+NhV fTlu78o9NQSV7V6K+unGt+m3nWUl0Gb3zAi65N9ZR7A+3zyS1wBFUt/I0I4AtvyIMl1mKgNc DmbI0UrSIANOMIeJMMoBC1LOOp9frvpWBXFyg4rt3Wdr2BNYi9Zdkk0o13JUNcIzhFKYByYA VpNozARBN1ezb3xxDqySRrY= --------------000804010800030109010504 Content-Type: application/octet-stream; name="patch-lib__pkgtools.rb.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch-lib__pkgtools.rb.sig" iQEcBAABAgAGBQJOUVOgAAoJEPXPYrMgexuhOU4H/0lrA4wJbHNH0fuPQMJQVDA1Dl3wr8Ve Vl/RX73PmoazfV2qHP19lmhy8XwCkOkPY27a/8NWVDr4+P7IM5jaREy9mRG6QjzZzG1rnKsG 7C8wYTPOSmZ/rQ6m6KpidHNW9P9961CFCE+FWtl4iv80+hXuUe5QckMg7bttCBAtyAuEcFUk po54tv/2KncaAoQS3xwCJqMzRcdtbRxrEk3xLrXyuh5ghdf82yonRJdHuKYWl4NlSax/fSaM d5wcEQxFNV6d2GjFbbDr4ynAW3D8Qz5YpCc7xnDGIBVjqDlz82I9QnaDSgkzX9hGNIN0etvr lplgr654m9SQNbbUSZoUN0w= --------------000804010800030109010504 Content-Type: application/octet-stream; name="patch-bin__portupgrade.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch-bin__portupgrade.sig" iQEcBAABAgAGBQJOUVOgAAoJEPXPYrMgexuhRqcIAJnCvR7R0cggW4U2SEdaTqDnN1umgKIb cUwcsQRs0oeQfdzAO9+0VrUmSQt8COYIn+8EBDaBl5Qs5Tum4u7zCipa0e+YuEJCpiSsmUzi lqWtP2co4L5RjTIGZK/4ptU7jxn91GrbLbeThov9qddIVpor/Bt5AZldzctIyeJuFMGYML15 YsO+JMBsa5K+vZrP/Grzj/VHmfKQR/q2hm9tuh7cgmDQZWqG4zDE+DObZtz9W5bVwJ66wmE7 vP8aBItrjvmgFL0M5KXNlAFgSyXr8GQWGL0e2zm+OL12NeSc8LcmL4dB77Ab0cIU/o5aWOhT SSKicmikZuJDa5qJTdDFAKk= --------------000804010800030109010504--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E5153A0.6040904>