diff options
| -rwxr-xr-x | lib/puppet/provider/package/dpkg.rb | 2 | ||||
| -rwxr-xr-x | lib/puppet/provider/package/ports.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb index b67cd2b76..ae79f714c 100755 --- a/lib/puppet/provider/package/dpkg.rb +++ b/lib/puppet/provider/package/dpkg.rb @@ -121,7 +121,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package end if hash[:error] != "ok" - raise Puppet::PackageError.new( + raise Puppet::Error.new( "Package %s, version %s is in error state: %s" % [hash[:name], hash[:ensure], hash[:error]] ) diff --git a/lib/puppet/provider/package/ports.rb b/lib/puppet/provider/package/ports.rb index 99e26ef23..96ef3f042 100755 --- a/lib/puppet/provider/package/ports.rb +++ b/lib/puppet/provider/package/ports.rb @@ -33,7 +33,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre begin output = portversion(*cmd) rescue Puppet::ExecutionFailure - raise Puppet::PackageError.new(output) + raise Puppet::Error.new(output) end line = output.split("\n").pop @@ -47,7 +47,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre info = $3 unless pkgstuff =~ /^(\S+)-([^-\s]+)$/ - raise Puppet::PackageError, + raise Puppet::Error, "Could not match package info '%s'" % pkgstuff end @@ -61,7 +61,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre # Else, we need to be updated; we need to pull out the new version unless info =~ /\((\w+) has (.+)\)/ - raise Puppet::PackageError, + raise Puppet::Error, "Could not match version info '%s'" % info end |