From 09c96f9519c4e248fc417ec82290bfd3026c5275 Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Tue, 21 Jan 2020 11:48:10 +0100 Subject: dev-db/scylla: we only need to fix yaml.load on seastar Package-Manager: Portage-2.3.81, Repoman-2.3.20 Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5 Signed-off-by: Alexys Jacob --- dev-db/scylla/Manifest | 18 +++++++++--------- dev-db/scylla/scylla-3.2.0.ebuild | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest index 2972d3d..4f71c8e 100644 --- a/dev-db/scylla/Manifest +++ b/dev-db/scylla/Manifest @@ -19,20 +19,20 @@ EBUILD scylla-3.1.1-r2.ebuild 7622 BLAKE2B 404ab3d8e42898a7379aa9872eb710aa183ca EBUILD scylla-3.1.1.ebuild 7497 BLAKE2B 9f9a71a22eecababea0ec5c4f156b50d2c858f3c764acaedb77eb159d0e4c6c9f8ce4c4efde856d04edce0a89d40759ed56bea62c7f693e44e489d3d69f8f6fa SHA512 b6fee615043cce8801f9d84d0599a6e6fb6ded7553b04b1b38bc7b560576ac918b20e542a8064d54ae9615bafa2fe7e854069bb749d0fd332c3c4584104a05a3 EBUILD scylla-3.1.2-r1.ebuild 7672 BLAKE2B 7249eb175499b7aa9ac0a5df43ffb4a573eca25d5f1b23c79935bd444320d977d7c2b3953c4569a606ded4a15028dc09c8374d1a0df8ce6dd45471a23fd2c662 SHA512 0e5ebf4b64ce7f4496ab94c87a3f8c432f762909f35b03501a4c84e6f6a7f780c35b947ececf0fd8e32a0a13dd011b8b074a955994cb46342336c2edb0e348c5 EBUILD scylla-3.1.2.ebuild 7075 BLAKE2B 6b690c242e061b69eb60d954cdbc00adc87651961cab3864b54b861b0349588110e4ba2c254076ae86a924e8f334937af9b60c11ca23a8f84553c11f920703cc SHA512 9a568b06f7b12ba8a09919c9f0a8f08c954a7a339eb1568026b6b2f8a8f5e8438f468c195ed6617402a2ef78aca42310f8388ce39312fb1b71bc09ea6c88990f -EBUILD scylla-3.2.0.ebuild 7104 BLAKE2B 81addc22ffcd7ad15ab728ed67a1598da092b60305ff1144e4e39d265bb20bb339a4b2fae3edcb89e8a045e41e53aacb59f56cff83bf81b34f528620e9b481ef SHA512 b9424a6055d444c3693ac41a46287e023cd0bf41a4b26dec41a4ecbd94b54ab743b9f657f3b139819c8ecc41fb59659e0d2aa62f7317d604ed9f23c920b17aea +EBUILD scylla-3.2.0.ebuild 7106 BLAKE2B 9a582f04af67cf352b3cf511f3acfef285667c5778f370b2ee3a0ff5a017cfebb4e79609be3ea575b7025572868573d3b7d2e4e44e1b8c7ad8154afa269eca0c SHA512 c0ebd471f74e837a97602014b9ddf10501f964590a7a794e8f0196a3699f90e5398344807c6bd58d9f925ea0e238ef7a5965cdb6b1e06d92aa8442ebdb64d1d5 EBUILD scylla-9999.ebuild 6403 BLAKE2B 4e176d656ed4224cf625562ffe89f422124bd05ae39f0d5d9b4e68093362bd8f4f44dd71f66e81d28c39c741ff4b9ba62c72fb237799a630d41e9d41b73ad250 SHA512 e04b414ee51c1b3ffea859c25f4ee40f75447d16b0494f25b1ca3bf756d7cce5823c9cb4d19be90dace91248edee826c20be608393eada09fda8913efe25c11b MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl4m0r9fFIAAAAAALgAo +iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl4m1s5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX -dy+qhAf9E+CRuZtH7xBVsOeFURaTRpZva0qUjTJX2R6P0r/RhyYmt+tRr1nNHocn -GBv6gRPkOhLh7H5YukQlQauBPAwqaebpSNxGlhMBg0KR8W7Vqj+pv94AaPm4YPBE -VKPv6xttUdQMLJV1W3IQjmzHC7q6xO5B99sEAURPpo1VBn3UCmUqW3zS3nub8xpi -+fQCgaKJ1qzHGZzp2mfR4gonuf3scbO7mz7uavt/u9eVGWdvjoWgA3ltY50aObBH -A1RVd801LqTrA0pE+Ff/uaN1HqdxeFUQrbXHiYCH7oPk4a/MeWkNY7zkjcpWXC1Z -xf48Oc3T5PoqZg0Mz07nsrH6IDPBlA== -=9Hui +dy+USQgA0i9sD/XqBprU06PJLZ4P2reQrJ+vBhWIfzwbj872qO+xNLXe2VgZNOM2 +cHzGkpQTpjfPkAHOMfjAAta492SRDyvIbjbSNaG1eBaYWyOAlyhmzWWVZwK0W91w +7CtIlkoJKbMJofbxHKP9sjEmo6OHJpF98cMA3R4Afbp/cCceijvLdif2Xz8AHjXa +iPXatnFipOp0B/vyAS16KyBLtnju3dLtFE98kZBU1hA58uM5Fv/Rx57uJMayKFpX +ASQCQfboNRwaUsXE57OU05I1yRcYnXo1+TgAnbtJd1ptkaw9w6DGm5Kb5OoHxk+J +3R4fslF5JW4xWdn+m9+64xbCtfSAlQ== +=qYNy -----END PGP SIGNATURE----- diff --git a/dev-db/scylla/scylla-3.2.0.ebuild b/dev-db/scylla/scylla-3.2.0.ebuild index 91dfe17..8e083eb 100644 --- a/dev-db/scylla/scylla-3.2.0.ebuild +++ b/dev-db/scylla/scylla-3.2.0.ebuild @@ -125,7 +125,7 @@ src_prepare() { # dist/common/scripts/scylla_blocktune.py # dist/common/scripts/scylla_util.py # dist/common/scripts/scylla_config_get.py - find "${S}/dist" -type f -exec sed -e 's/yaml.load(/yaml.full_load(/g' -i {} \+ || die + # find "${S}/dist" -type f -exec sed -e 's/yaml.load(/yaml.full_load(/g' -i {} \+ || die sed -e 's/yaml.load(/yaml.safe_load(/g' -i seastar/scripts/perftune.py || die # fix /opt/scylladb/scripts -- cgit v1.2.3-65-gdbad