app-admin/salt: rebase files/salt-2015.8.13-sanitize-minion-name.patch so it actually...

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 6ede1399072833bbc2127d5c491a052c454fdd53..df9e0f66d00528e157a22d35ffd379bc3706980e 100644 (file)
--- 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