From 7bda1dcd4f14da55abe38b1739b1e46ad0f5213c Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Fri, 13 Apr 2018 11:25:24 -0500 Subject: [PATCH] Fix diffing binary files in file.get_diff (bsc#1098394) --- salt/modules/file.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/salt/modules/file.py b/salt/modules/file.py index 1b4b7e0e46..95bca7fb1b 100644 --- a/salt/modules/file.py +++ b/salt/modules/file.py @@ -5008,8 +5008,7 @@ def get_diff(file1, *salt.utils.data.decode(args) ) ) - return ret - return '' + return ret def manage_file(name, -- 2.13.7