Merge commit '2.6.2' into next

4 files changed, 11 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4cfa97d83..f0c596ee5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
+2.6.2
+=====
+1d719be  Fix for #4945 -- explicitly check os to supress man page installation
+55417bc  Reversion of 021d534482dd8edb863cb77d668ac3525362a0a6
+a6e2bea  Fixed #4919 - added parenths to fix error message:
+
 2.6.2rc1
 ========
+917c520  Incremented version to 2.6.2
+900eae4  Updated CHANGELOG for 2.6.2rc1
 1b6094d  Fixed documentation typo
 bdf12fe  Fix for #4896 -- stray newline left over from removed diagnostic
 e7424c6  (#4772) Update SuSE .spec file
diff --git a/install.rb b/install.rb
index 449223d26..f7541c854 100755
--- a/install.rb
+++ b/install.rb
@@ -462,4 +462,4 @@ prepare_installation
 do_bins(sbins, InstallOptions.sbin_dir)
 do_bins(bins, InstallOptions.bin_dir)
 do_libs(libs)
-do_man(man) if InstallOptions.man
+do_man(man) unless $operatingsystem == "windows"
diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb
index ec6121743..72dc260a4 100755
--- a/lib/puppet/provider/package/rpm.rb
+++ b/lib/puppet/provider/package/rpm.rb
@@ -60,8 +60,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     begin
       output = rpm(*cmd)
     rescue Puppet::ExecutionFailure
-      # rpm exits 1 if the package is not found.
-      return {:ensure => :purged, :status => 'missing', :name => @resource[:name], :error => 'ok'}    
+      return nil
     end
 
     # FIXME: We could actually be getting back multiple packages
diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb
index 00898472f..90a244836 100644
--- a/lib/puppet/util/metric.rb
+++ b/lib/puppet/util/metric.rb
@@ -59,7 +59,7 @@ class Puppet::Util::Metric
     if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
       puts @rrd.info
     else
-      puts RRD.info self.path
+      puts RRD.info(self.path)
     end
   end