Merge pull request #18125 from cvrebert/patch-1

btrfs module: use new-style except-as syntax
This commit is contained in:
Pedro Algarvio 2014-11-16 08:39:04 +00:00
commit b6e6968c22

View File

@ -655,7 +655,7 @@ def properties(obj, type=None, set=None):
for keyset in set.split(",")]:
cmd.append(key)
cmd.append(value)
except Exception, ex:
except Exception as ex:
raise CommandExecutionError(ex)
out = __salt__['cmd.run_all'](' '.join(cmd))