From 0ffacedb3e41ec49df3606c0df1a1f0688868c32 Mon Sep 17 00:00:00 2001
From: Matthew Dawson <matthew.w.dawson@gmail.com>
Date: Thu, 12 Jan 2017 23:04:14 +0000
Subject: [PATCH] Fixes #3539 "win_robocopy does not return changed properly"
 (#20158)

* Fixes #3539 "win_robocopy does not return changed properly"

Remove .win_robocopy from $result so that ansible can see the values properly. This also matches up with the existing documentation.

* Update documentation to match new return values
---
 lib/ansible/modules/windows/win_robocopy.ps1 | 25 +++++++++-----------
 lib/ansible/modules/windows/win_robocopy.py  |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/ansible/modules/windows/win_robocopy.ps1 b/lib/ansible/modules/windows/win_robocopy.ps1
index ca393c7eba0..24f041a2872 100644
--- a/lib/ansible/modules/windows/win_robocopy.ps1
+++ b/lib/ansible/modules/windows/win_robocopy.ps1
@@ -22,10 +22,8 @@
 $params = Parse-Args $args;
 
 $result = New-Object psobject @{
-    win_robocopy = New-Object psobject @{
-        recurse         = $false
-        purge           = $false
-    }
+    recurse = $false
+    purge = $false
     changed = $false
 }
 
@@ -70,10 +68,10 @@ if (-Not (Test-Path $src)) {
 }
 
 $robocopy_opts += $src
-Set-Attr $result.win_robocopy "src" $src
+Set-Attr $result "src" $src
 
 $robocopy_opts += $dest
-Set-Attr $result.win_robocopy "dest" $dest
+Set-Attr $result "dest" $dest
 
 if ($flags -eq $null) {
     if ($purge) {
@@ -90,9 +88,9 @@ Else {
     }
 }
 
-Set-Attr $result.win_robocopy "purge" $purge
-Set-Attr $result.win_robocopy "recurse" $recurse
-Set-Attr $result.win_robocopy "flags" $flags
+Set-Attr $result "purge" $purge
+Set-Attr $result "recurse" $recurse
+Set-Attr $result "flags" $flags
 
 $robocopy_output = ""
 $rc = 0
@@ -111,8 +109,8 @@ Else {
     }
 }
 
-Set-Attr $result.win_robocopy "return_code" $rc
-Set-Attr $result.win_robocopy "output" $robocopy_output
+Set-Attr $result "return_code" $rc
+Set-Attr $result "output" $robocopy_output
 
 $cmd_msg = "Success"
 $changed = $false
@@ -163,8 +161,7 @@ switch ($rc)
     }
 }
 
-
-Set-Attr $result.win_robocopy "msg" $cmd_msg
-Set-Attr $result.win_robocopy "changed" $changed
+Set-Attr $result "msg" $cmd_msg
+Set-Attr $result "changed" $changed
 
 Exit-Json $result
diff --git a/lib/ansible/modules/windows/win_robocopy.py b/lib/ansible/modules/windows/win_robocopy.py
index ca7f69594b1..0c84a2c4af1 100644
--- a/lib/ansible/modules/windows/win_robocopy.py
+++ b/lib/ansible/modules/windows/win_robocopy.py
@@ -129,7 +129,7 @@ flags:
     returned: always
     type: string
     sample: "/e /purge"
-return_code:
+rc:
     description: The return code retuned by robocopy.
     returned: success
     type: int