puppet-ruby19-case.patch
| b/lib/puppet/rails.rb | ||
|---|---|---|
| 51 | 51 | |
| 52 | 52 |
socket = Puppet[:dbsocket] |
| 53 | 53 |
args[:socket] = socket unless socket.empty? |
| 54 |
when "oracle_enhanced":
|
|
| 54 |
when "oracle_enhanced" |
|
| 55 | 55 |
args[:database] = Puppet[:dbname] unless Puppet[:dbname].empty? |
| 56 | 56 |
args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty? |
| 57 | 57 |
args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty? |
| b/lib/puppet/type/file.rb | ||
|---|---|---|
| 120 | 120 |
munge do |value| |
| 121 | 121 |
newval = super(value) |
| 122 | 122 |
case newval |
| 123 |
when :true, :inf: true
|
|
| 124 |
when :false: false
|
|
| 125 |
when :remote: :remote
|
|
| 126 |
when Integer, Fixnum, Bignum:
|
|
| 123 |
when :true, :inf; true
|
|
| 124 |
when :false; false
|
|
| 125 |
when :remote; :remote
|
|
| 126 |
when Integer, Fixnum, Bignum;
|
|
| 127 | 127 |
self.warning "Setting recursion depth with the recurse parameter is now deprecated, please use recurselimit" |
| 128 | 128 | |
| 129 | 129 |
# recurse == 0 means no recursion |
| ... | ... | |
| 131 | 131 | |
| 132 | 132 |
resource[:recurselimit] = value |
| 133 | 133 |
true |
| 134 |
when /^\d+$/:
|
|
| 134 |
when /^\d+$/;
|
|
| 135 | 135 |
self.warning "Setting recursion depth with the recurse parameter is now deprecated, please use recurselimit" |
| 136 | 136 |
value = Integer(value) |
| 137 | 137 | |
| ... | ... | |
| 154 | 154 |
munge do |value| |
| 155 | 155 |
newval = super(value) |
| 156 | 156 |
case newval |
| 157 |
when Integer, Fixnum, Bignum: value
|
|
| 158 |
when /^\d+$/: Integer(value)
|
|
| 157 |
when Integer, Fixnum, Bignum; value
|
|
| 158 |
when /^\d+$/; Integer(value)
|
|
| 159 | 159 |
else |
| 160 | 160 |
raise ArgumentError, "Invalid recurselimit value %s" % value.inspect |
| 161 | 161 |
end |
| ... | ... | |
| 613 | 613 |
end |
| 614 | 614 | |
| 615 | 615 |
case s.ftype |
| 616 |
when "directory" |
|
| 616 |
when "directory";
|
|
| 617 | 617 |
if self[:force] == :true |
| 618 | 618 |
debug "Removing existing directory for replacement with %s" % should |
| 619 | 619 |
FileUtils.rmtree(self[:path]) |
| 620 | 620 |
else |
| 621 | 621 |
notice "Not removing directory; use 'force' to override" |
| 622 | 622 |
end |
| 623 |
when "link", "file" |
|
| 623 |
when "link", "file";
|
|
| 624 | 624 |
debug "Removing existing %s for replacement with %s" % |
| 625 | 625 |
[s.ftype, should] |
| 626 | 626 |
File.unlink(self[:path]) |