1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00

- Remove unnecessary patches.

Reported by:	pav
Forgotten by:	alepulver (myself)
This commit is contained in:
Alejandro Pulver 2007-09-29 15:59:55 +00:00
parent 8396f7bcfa
commit 63ad6e3205
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=200362
3 changed files with 0 additions and 51 deletions

View File

@ -1,13 +0,0 @@
always define PATCH. without it, puppetd hangs when upgrading INTERACTIVE port.
http://reductivelabs.com/trac/puppet/ticket/624
--- lib/puppet/provider/package/ports.rb.orig Tue May 8 14:55:34 2007
+++ lib/puppet/provider/package/ports.rb Tue May 8 14:55:57 2007
@@ -19,7 +19,7 @@
# -p: create a package
# -N: install if the package is missing, otherwise upgrade
# -P: prefer binary packages
- cmd = %w{-p -N -P} << @model[:name]
+ cmd = %w{-p -N -P -M BATCH=yes} << @model[:name]
output = portupgrade(*cmd)
if output =~ /\*\* No such /

View File

@ -1,25 +0,0 @@
Support both /etc/rc.d/daemon and /etc/rc.d/daemon.sh
http://reductivelabs.com/trac/puppet/ticket/572
--- lib/puppet/provider/service/init.rb.orig Mon Apr 2 17:52:00 2007
+++ lib/puppet/provider/service/init.rb Mon Apr 2 18:01:50 2007
@@ -114,6 +114,19 @@
# if we've gotten this far, we found a valid script
return fqname
}
+ @model[:path].each { |path|
+ fqname_sh = File.join(path,"#{name}.sh")
+ begin
+ stat = File.stat(fqname_sh)
+ rescue
+ # should probably rescue specific errors...
+ self.debug("Could not find %s.sh in %s" % [name,path])
+ next
+ end
+
+ # if we've gotten this far, we found a valid script
+ return fqname_sh
+ }
raise Puppet::Error, "Could not find init script for '%s'" % name
end

View File

@ -1,13 +0,0 @@
support package that contains '-' in its name, like syslog-ng
http://reductivelabs.com/trac/puppet/ticket/628
--- lib/puppet/provider/package/ports.rb.orig Wed May 9 17:12:39 2007
+++ lib/puppet/provider/package/ports.rb Wed May 9 17:13:57 2007
@@ -47,7 +47,7 @@
match = $2
info = $3
- unless pkgstuff =~ /^(\w+)-([0-9].+)$/
+ unless pkgstuff =~ /^(\S+)-([^-\s]+)$/
raise Puppet::PackageError,
"Could not match package info '%s'" % pkgstuff
end