diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-16 16:47:37 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-16 16:47:37 +0100 |
| commit | 8aebb228036d5e2863b7eaa6e319ab41c1669269 (patch) | |
| tree | 00f4b90ce32462dc8e99ae54a31d6462ea2c3ac6 /app-admin/salt | |
| parent | 76cba73c47c8694e74377004634daca18f2d9c08 (diff) | |
gentoo resync : 16.04.2018
Diffstat (limited to 'app-admin/salt')
| -rw-r--r-- | app-admin/salt/Manifest | 1 | ||||
| -rw-r--r-- | app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch | 48 |
2 files changed, 0 insertions, 49 deletions
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 221a89363be0..c337250d07d8 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -10,7 +10,6 @@ AUX salt-2016.11.0-tmpdir.patch 1480 BLAKE2B c5501459ba32a5ef08317f4e1a247a7ac2a AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 BLAKE2B e78c50d1050adad0d21523229034a24f1fd2c977172f3135dbf09440ed6d7e292f0dd9c267c3277edfe8528bf38d269939d068b4af8671da08c64f5712c0d7e1 SHA512 a6bc22959975ac25df84c54437a1638e95d78c057920ced38b0accddca11eb33ad39f2a43dd05648584cd10b140f7ee509a8c6739c4d89d30500452c91795b79 AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17 -AUX salt-2017.7.2-fix_disk_format.patch 2111 BLAKE2B e8a1c24cd780e29092e3112256bbe3cf518dac49479abfcac0b2432b8528c448241bfc0cce5bbf20b1be674cd49766c151547cfb4d5ef0894b3c9a1d28ad332e SHA512 33c73a70e163135c238b85ad6a0beaed5ed5d339fee19dfa15f7dd073200cb788ec5234d89939eab1a8b080ccd0b22ed0a5409cfaad27ac1abbbda3f018f3d75 AUX salt-2017.7.3-tests.patch 3096 BLAKE2B bde978ec7d9ca3f303e859d8ecc728ee16e6b1753afe2325f95b0938ed2828ac5b3f80ac92451f6ab4bf7f08f141b71df88641da9694828657dd358059df9826 SHA512 0db8e8dffeabd9f7c0c619480425c58f4b58a486e1866062c8a482489bb79fd6f31c06020ed83e1903a346cbacb221ba541a2363d4e983e583313adb4652d22f AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 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 9e58d93f7dd4..000000000000 --- 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', |