Merge pull request #37424 from kojiromike/gpg-no-append-method-on-string

Avoid Early Convert ret['comment'] to String
saltstack · Nov 2, 2016 · cc84356 · cc84356
2 parents 2d56093 + ceb7735
commit cc84356
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/salt/states/gpg.py b/salt/states/gpg.py
@@ -132,7 +132,7 @@ def present(name,
                 else:
                     ret['comment'].append('Invalid trust level {0}'.format(trust))
 
-        ret['comment'] = '\n'.join(ret['comment'])
+    ret['comment'] = '\n'.join(ret['comment'])
     return ret
 
 
@@ -188,5 +188,5 @@ def absent(name,
                 ret['comment'].append('Deleting {0} from GPG keychain'.format(name))
         else:
             ret['comment'].append('{0} not found in GPG keychain'.format(name))
-        ret['comment'] = '\n'.join(ret['comment'])
+    ret['comment'] = '\n'.join(ret['comment'])
     return ret