public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Austin English" <wizardedit@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/files/
Date: Mon, 11 Sep 2017 22:23:12 +0000 (UTC)	[thread overview]
Message-ID: <1505168570.c83c31660a642946f55a6c5cc1b998681c28e06c.wizardedit@gentoo> (raw)

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
  


             reply	other threads:[~2017-09-11 22:23 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-11 22:23 Austin English [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-11-08 23:50 [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/files/ Patrick McLean
2022-07-18 21:41 Conrad Kostecki
2022-06-28 20:57 Patrick McLean
2021-04-15 18:05 Conrad Kostecki
2020-04-29  4:31 Patrick McLean
2018-04-15 12:43 David Seifert
2016-07-01  8:02 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1505168570.c83c31660a642946f55a6c5cc1b998681c28e06c.wizardedit@gentoo \
    --to=wizardedit@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox