1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

- Update to 2.7.20

- Remove reversed and unnecessary patch for issue already fixed upstream

Feature safe:	yes
This commit is contained in:
Steve Wills 2012-11-23 22:32:30 +00:00
parent cee79b9e0b
commit 5692af00ad
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=307689
3 changed files with 3 additions and 21 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= puppet
PORTVERSION= 2.7.19
PORTREVISION= 1
PORTVERSION= 2.7.20
CATEGORIES= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/puppet/

View File

@ -1,2 +1,2 @@
SHA256 (puppet-2.7.19.tar.gz) = 13b103513253ae5af466c8fcf25f36cbc41290f824fa7580041f0700d23a3c3a
SIZE (puppet-2.7.19.tar.gz) = 1936300
SHA256 (puppet-2.7.20.tar.gz) = 77d39513261bd38322b04aef5002c134de73e40343684cdff5459ab33703fafb
SIZE (puppet-2.7.20.tar.gz) = 1982220

View File

@ -1,17 +0,0 @@
--- lib/puppet/provider/exec.rb.orig 2012-08-21 17:41:17.000000000 -0400
+++ lib/puppet/provider/exec.rb 2012-08-30 12:31:32.000000000 -0400
@@ -66,11 +66,9 @@
end
def extractexe(command)
- if command.is_a? Array
- command.first
- elsif match = /^"([^"]+)"|^'([^']+)'/.match(command)
- # extract whichever of the two sides matched the content.
- match[1] or match[2]
+ # easy case: command was quoted
+ if command =~ /^"([^"]+)"/
+ $1
else
command.split(/ /)[0]
end