From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/files/
Date: Sun, 15 Apr 2018 12:43:16 +0000 (UTC) [thread overview]
Message-ID: <1523796181.ee301819801928f8ec2aa3331a22e3c25558838d.soap@gentoo> (raw)
commit: ee301819801928f8ec2aa3331a22e3c25558838d
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Apr 14 15:56:05 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 12:43:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee301819
app-admin/salt: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/7990
.../salt/files/salt-2017.7.2-fix_disk_format.patch | 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch b/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch
deleted file mode 100644
index 9e58d93f7dd..00000000000
--- a/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 18fb0be96a146589ccbd642caa9244480c51140b Mon Sep 17 00:00:00 2001
-From: Matthew Summers <msummers42@gmail.com>
-Date: Mon, 9 Oct 2017 20:38:52 -0500
-Subject: [PATCH 1/2] addresses issue #43307, disk.format_ to disk.format
-
-This change fixes breakage. It appears the disk.format_ func is
-aliased to disk.format in modules/disk.py
----
- salt/states/blockdev.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/salt/states/blockdev.py b/salt/states/blockdev.py
-index 4b0dc5ca81d..e6ecfeab3f1 100644
---- a/salt/states/blockdev.py
-+++ b/salt/states/blockdev.py
-@@ -159,7 +159,7 @@ def formatted(name, fs_type='ext4', force=False, **kwargs):
- ret['result'] = None
- return ret
-
-- __salt__['disk.format_'](name, fs_type, force=force, **kwargs)
-+ __salt__['disk.format'](name, fs_type, force=force, **kwargs)
-
- # Repeat fstype check up to 10 times with 3s sleeping between each
- # to avoid detection failing although mkfs has succeeded
-
-From 16e1c1dfc86920b7a00dbf7c39b805c359e4d13b Mon Sep 17 00:00:00 2001
-From: Matthew Summers <matthew.summers@syapse.com>
-Date: Mon, 16 Oct 2017 09:47:40 -0500
-Subject: [PATCH 2/2] fixed test addressing issue #43307, disk.format_ to
- disk.format
-
----
- tests/unit/states/test_blockdev.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/unit/states/test_blockdev.py b/tests/unit/states/test_blockdev.py
-index e5899f1c70a..9b559dddfe5 100644
---- a/tests/unit/states/test_blockdev.py
-+++ b/tests/unit/states/test_blockdev.py
-@@ -100,7 +100,7 @@ def test_formatted(self):
-
- # Test state return when block device format fails
- with patch.dict(blockdev.__salt__, {'cmd.run': MagicMock(return_value=mock_ext4),
-- 'disk.format_': MagicMock(return_value=True)}):
-+ 'disk.format': MagicMock(return_value=True)}):
- comt = ('Failed to format {0}'.format(name))
- ret.update({'comment': comt, 'result': False})
- with patch.object(salt.utils, 'which',
next reply other threads:[~2018-04-15 12:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-15 12:43 David Seifert [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
2017-09-11 22:23 Austin English
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=1523796181.ee301819801928f8ec2aa3331a22e3c25558838d.soap@gentoo \
--to=soap@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