Merge branch 'RexOps:master' into load_rexfile_test_and_fix

Author: uralm1

ChangeLog

@@ -8,6 +8,8 @@ Revision history for Rex
 
  [DOCUMENTATION]
  - Clarify optional arguments of file commands
+ - Clarify optional arguments of the pkg command
+ - Correct example for file_read command
 
  [ENHANCEMENTS]
  - Use $SIG{__WARN__} when loading Rexfile instead stderr redirection

lib/Rex/Commands/File.pm

@@ -840,7 +840,7 @@ On failure it will die.
 
  my $fh;
  eval {
-   $fh = read("/etc/groups");
+   $fh = file_read("/etc/groups");
  };
  
  # catch an error

lib/Rex/Commands/Pkg.pm

@@ -60,7 +60,7 @@ use vars qw(@EXPORT);
 @EXPORT =
   qw(install update remove update_system installed_packages is_installed update_package_db repository package_provider_for pkg);
 
-=head2 pkg($package, %options)
+=head2 pkg($package [, %options])
 
 Since: 0.45
 

lib/Rex/Pkg/Base.pm

@@ -273,7 +273,9 @@ OLD_PKG:
   push @modifications, map { $_->{action} = 'installed'; $_ }
     grep { !exists $_->{found} } @new_installed;
 
-  map { delete $_->{found} } @modifications;
+  for (@modifications) {
+    delete $_->{found};
+  }
 
   return @modifications;
 }

lib/Rex/Pkg/Debian.pm

@@ -118,7 +118,9 @@ OLD_PKG:
   push @modifications, map { $_->{action} = 'installed'; $_ }
     grep { !exists $_->{found} } @new_installed;
 
-  map { delete $_->{found} } @modifications;
+  for (@modifications) {
+    delete $_->{found};
+  }
 
   return @modifications;
 }

t/package.t

@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 4;
+use Test::More tests => 5;
 
 use Rex::Pkg::Base;
 
@@ -33,4 +33,7 @@ is( $found_libssh2->{action}, "installed", "libssh2-1 was installed" );
 my ($found_mc) = grep { $_->{name} eq "mc" } @mods;
 is( $found_mc->{action}, "removed", "mc was removed" );
 
+my $leftover_found = scalar grep { defined $_->{found} } @mods;
+is( $leftover_found, 0, 'no internal found marker left' );
+
 1;