[gentoo-commits] repo/gentoo:master commit in: app-admin/salt/, app-admin/salt/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/, app-admin/salt/files/
Date: Wed, 24 Oct 2018 23:02:12 +0000 (UTC)	[thread overview]
Message-ID: <1540421940.9fb2ad3eddd80634ff623c9b9d6ae3a9499e55a6.chutzpah@gentoo> (raw)

commit:     9fb2ad3eddd80634ff623c9b9d6ae3a9499e55a6
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed Oct 24 20:36:12 2018 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 22:59:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb2ad3e

app-admin/salt: Version bump to 2017.7.8

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-admin/salt/Manifest                            |  2 +-
 ...7.7.3-tests.patch => salt-2017.7.8-tests.patch} | 24 +++++++++++++---------
 .../{salt-2017.7.7.ebuild => salt-2017.7.8.ebuild} |  6 +++---
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 011dcc86542..07da69d6b1b 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,3 +1,3 @@
 DIST salt-2016.11.10.tar.gz 10058200 BLAKE2B 4b6a42f6bf56421bc19458686ec23a1f945ceeb68b4ce7059fde036ba98d677fc8b61cb0f0c6ab249304b2f07d1b0250f6b91e7c443e12868649bf88f4d44d43 SHA512 e767e2c4c20e3a49a748b2699e4c640610280c0ba1c5955d94daffc7c36991ee632f02a50e338c65b35da146e234c36cc732214174b9bc5cbd62316b9ee40c28
-DIST salt-2017.7.7.tar.gz 11131480 BLAKE2B ea01c8894433cf96697c830d58184bfefca52dcd1be9b1c398270acc229886eeb41edf83d1498fc500f23209fc4e56ba8471da88383bd4c1a9338262423477fb SHA512 01cba364e2dcb5021b2b3b738462645c84332bbf31c0fa82f017fc583a097dccde308fd86be54d2b429921f34c89a4a40b942385c3bc139eb11753d155664063
+DIST salt-2017.7.8.tar.gz 12060430 BLAKE2B b2dde1b6f43bbb9b9db29b70dfd57591ae0e490e35ec7f4895b68b444ff77f9e997321d73697f791d345756abf451f11891b5f78a97c537c35dfe8bd24c43bbc SHA512 1e5123ee3dc194a33cf5da1e68a0419230b2b4eea26e7f66bf2d64754f0dbef9012abfbd498015f6b675725e580d72abf13c151b106639597337498b1fd42238
 DIST salt-2018.3.2.tar.gz 12996445 BLAKE2B 8411fb0891e23ce8e35157662a0a45c0c5b13b62f3fd21cc4bbe5152f923a98b27cb5bee4fb8cb3e6ec5c9daed1afa27baf4b570b94f9f40eddc0891f72829e9 SHA512 142ebe13638d7e6dd0aecc9f0325002d30e115fe8688f5f74cbeb7ff21020327d65ded0dcd845e55362b97568b696887fa22243d66d5eadef65f97152d4775d3

diff --git a/app-admin/salt/files/salt-2017.7.3-tests.patch b/app-admin/salt/files/salt-2017.7.8-tests.patch
similarity index 80%
rename from app-admin/salt/files/salt-2017.7.3-tests.patch
rename to app-admin/salt/files/salt-2017.7.8-tests.patch
index 9399bf87334..e428108c461 100644
--- a/app-admin/salt/files/salt-2017.7.3-tests.patch
+++ b/app-admin/salt/files/salt-2017.7.8-tests.patch
@@ -1,25 +1,29 @@
 diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py
-index cc9c8dbce9..a50a240c25 100644
+index 23f3b26874..bf0b55c385 100644
 --- a/tests/unit/fileserver/test_roots.py
 +++ b/tests/unit/fileserver/test_roots.py
-@@ -164,12 +164,6 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
+@@ -173,16 +173,6 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
          ret = roots.dir_list({'saltenv': 'base'})
          self.assertIn('empty_dir', ret)
  
 -    def test_symlink_list(self):
--        if self.test_symlink_list_file_roots:
--            self.opts['file_roots'] = self.test_symlink_list_file_roots
--        ret = roots.symlink_list({'saltenv': 'base'})
--        self.assertDictEqual(ret, {'dest_sym': 'source_sym'})
--
+-        orig_file_roots = self.opts['file_roots']
+-        try:
+-            if self.test_symlink_list_file_roots:
+-                self.opts['file_roots'] = self.test_symlink_list_file_roots
+-            ret = roots.symlink_list({'saltenv': 'base'})
+-            self.assertDictEqual(ret, {'dest_sym': 'source_sym'})
+-        finally:
+-            if self.test_symlink_list_file_roots:
+-                self.opts['file_roots'] = orig_file_roots
  
- class RootsLimitTraversalTest(TestCase, AdaptedConfigurationTestCaseMixin):
  
+ class RootsLimitTraversalTest(TestCase, AdaptedConfigurationTestCaseMixin):
 diff --git a/tests/unit/modules/test_inspect_collector.py b/tests/unit/modules/test_inspect_collector.py
-index 0d37519a9e..c18be8d592 100644
+index c2a86d9e5e..421cab9b52 100644
 --- a/tests/unit/modules/test_inspect_collector.py
 +++ b/tests/unit/modules/test_inspect_collector.py
-@@ -59,44 +59,6 @@ class InspectorCollectorTestCase(TestCase):
+@@ -61,44 +61,6 @@ class InspectorCollectorTestCase(TestCase):
              inspector.pidfile,
              os.sep + os.sep.join(['foo', 'pid', 'bar.pid']))
  

diff --git a/app-admin/salt/salt-2017.7.7.ebuild b/app-admin/salt/salt-2017.7.8.ebuild
similarity index 97%
rename from app-admin/salt/salt-2017.7.7.ebuild
rename to app-admin/salt/salt-2017.7.8.ebuild
index bb76353c1a4..af04cbe98e2 100644
--- a/app-admin/salt/salt-2017.7.7.ebuild
+++ b/app-admin/salt/salt-2017.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
@@ -94,7 +94,7 @@ RESTRICT="x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2017.7.3-tests.patch"
+	"${FILESDIR}/${PN}-2017.7.8-tests.patch"
 )
 
 python_prepare() {

next             reply	other threads:[~2018-10-24 23:02 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-24 23:02 Patrick McLean [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-24  9:23 [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/, app-admin/salt/files/ Sebastian Pipping
2023-09-08 22:56 Patrick McLean
2023-08-15 19:47 Patrick McLean
2023-04-20 19:19 Patrick McLean
2023-01-30  4:55 Sebastian Pipping
2023-01-10 14:15 Michał Górny
2022-08-31 17:21 Patrick McLean
2022-06-22 11:50 Michał Górny
2022-04-18 18:49 Patrick McLean
2022-04-18 17:34 Patrick McLean
2022-03-31 16:18 Patrick McLean
2022-03-31 16:07 Patrick McLean
2022-03-27  1:00 Sam James
2021-09-08  1:01 Patrick McLean
2021-06-09 22:27 Patrick McLean
2021-02-27  2:32 Patrick McLean
2021-02-27  2:32 Patrick McLean
2021-02-18  1:18 Patrick McLean
2021-02-09 17:00 Patrick McLean
2020-09-04  1:45 Patrick McLean
2020-04-30 17:58 Patrick McLean
2020-04-30  1:17 Patrick McLean
2019-02-27 21:40 Patrick McLean
2017-12-05 21:44 Patrick McLean
2017-08-15 17:17 Manuel Rüger
2017-08-01  1:28 Patrick McLean
2016-12-01  1:16 Patrick McLean
2016-12-01  1:16 Patrick McLean
2016-06-16 23:43 Patrick McLean
2016-06-16 18:48 Patrick McLean
2016-02-01 22:57 Patrick McLean
2015-11-24  0:21 Patrick McLean
2015-11-20  2:16 Patrick McLean
2015-11-06  7:58 Justin Lecher
2015-08-25 17:31 Patrick McLean

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:011dcc8654 dfblob:07da69d6b1 dfblob:9399bf8733
dfblob:e428108c46 dfblob:bb76353c1a dfblob:af04cbe98e )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-admin/salt/, app-admin/salt/files/" )
	(help)

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=1540421940.9fb2ad3eddd80634ff623c9b9d6ae3a9499e55a6.chutzpah@gentoo \
    --to=chutzpah@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