sysutils/rubygem-facter: update 2.1.0 -> 2.2.0

- Removed patch-lib-facter-zpool_version.rb (accepted by upstream)

Approved by:	mentors (implicit)
This commit is contained in:
Bartek Rutkowski 2014-09-17 09:24:53 +00:00
parent 3a1aa3c465
commit 122c1644d9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=368358
3 changed files with 3 additions and 15 deletions

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= facter
PORTVERSION= 2.1.0
PORTREVISION= 1
PORTVERSION= 2.2.0
CATEGORIES= sysutils rubygems
MASTER_SITES= RG \
http://downloads.puppetlabs.com/facter/

View file

@ -1,2 +1,2 @@
SHA256 (rubygem/facter-2.1.0.gem) = f4c5573d309520fed49651f36d5a0366bf40609a0ff04a34266a01d263704f17
SIZE (rubygem/facter-2.1.0.gem) = 218112
SHA256 (rubygem/facter-2.2.0.gem) = 1003ebd3f368577a498d5cc8d2b402a4d0403b6a8c5349c561c468d1a9bf859e
SIZE (rubygem/facter-2.2.0.gem) = 238592

View file

@ -1,11 +0,0 @@
--- lib/facter/zpool_version.rb.orig
+++ lib/facter/zpool_version.rb
@@ -4,7 +4,7 @@
setcode do
if Facter::Core::Execution.which('zpool')
zpool_v = Facter::Core::Execution.exec('zpool upgrade -v')
- zpool_version = zpool_v.match(/ZFS pool version (\d+)./).captures.first unless zpool_v.empty?
+ zpool_version = zpool_v.scan(/^\s+(\d+)\s+/m).flatten.last unless zpool_v.empty?
end
end
end