Merge pull request #23 from rightscale-cookbooks/st_15_02_wrong_shell…

…_out_method 'stdout' method for 'shell_out!' was not used to return output string.
rightscale-cookbooks · Jan 27, 2015 · a17610d · a17610d
2 parents 63f27f7 + b834f1c
commit a17610d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ machine_tag Cookbook CHANGELOG
 
 This file is used to list changes made in each version of the machine_tag cookbook.
 
+v1.0.9
+------
+
+- Fixed bug in run_rs_tag_util method not returning string output.
+
 v1.0.8
 ------
 

diff --git a/libraries/machine_tag_rightscale.rb b/libraries/machine_tag_rightscale.rb
@@ -84,7 +84,7 @@ def run_rs_tag_util(*args)
       # we will do retries with a timeout.
       Timeout.timeout(120) do
         begin
-          shell_out!(cmd).run_command
+          shell_out!(cmd).run_command.stdout
         rescue Mixlib::ShellOut::ShellCommandFailed => err_msg
           puts "#{err_msg}\nretrying"
           sleep 2

diff --git a/metadata.rb b/metadata.rb
@@ -4,6 +4,6 @@
 license          'Apache 2.0'
 description      'Installs/Configures machine_tag'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.0.8'
+version          '1.0.9'
 
 recipe 'machine_tag::default', "Installs the 'machine_tag' gem used by the helpers."
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,11 @@ machine_tag Cookbook CHANGELOG @@
     This file is used to list changes made in each version of the machine_tag cookbook.
+    v1.0.9
+    ------
+    - Fixed bug in run_rs_tag_util method not returning string output.
     v1.0.8
     ------
@@ Expand Down @@