diff options
| author | Austin English <wizardedit@gentoo.org> | 2017-09-11 16:13:18 -0500 |
|---|---|---|
| committer | Austin English <wizardedit@gentoo.org> | 2017-09-11 17:22:50 -0500 |
| commit | c83c31660a642946f55a6c5cc1b998681c28e06c (patch) | |
| tree | 0824c164be2efe7009dea8183011c4757994f87c /app-admin/salt | |
| parent | 49a752ec46cbcc5cfc39cf4e302d04087fba3ab4 (diff) | |
| download | gentoo-c83c31660a642946f55a6c5cc1b998681c28e06c.tar.gz gentoo-c83c31660a642946f55a6c5cc1b998681c28e06c.tar.xz | |
app-admin/salt: rebase files/salt-2015.8.13-sanitize-minion-name.patch so it actually applies
Diffstat (limited to 'app-admin/salt')
| -rw-r--r-- | app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch b/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch index 6ede1399072..df9e0f66d00 100644 --- a/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch +++ b/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch @@ -11,7 +11,7 @@ diff --git a/salt/utils/verify.py b/salt/utils/verify.py index 5cac0fa651b..a3dc67db336 100644 --- a/salt/utils/verify.py +++ b/salt/utils/verify.py -@@ -480,12 +480,21 @@ def clean_path(root, path, subdir=False): +@@ -484,12 +484,21 @@ def clean_path(root, path, subdir=False): return '' @@ -31,6 +31,6 @@ index 5cac0fa651b..a3dc67db336 100644 try: - return bool(clean_path(opts['pki_dir'], id_)) + return bool(clean_path(opts['pki_dir'], id_)) and clean_id(id_) - except (AttributeError, KeyError, TypeError) as e: + except (AttributeError, KeyError) as e: return False |