commit: c83c31660a642946f55a6c5cc1b998681c28e06c
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 21:13:18 2017 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 22:22:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c83c3166
app-admin/salt: rebase files/salt-2015.8.13-sanitize-minion-name.patch so it
actually applies
app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch | 4 ++--
1 file 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
