From 66982ba85fd224ddedbb08321728d773b65f41ab Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 8 Jan 2018 16:48:18 +0100 Subject: [PATCH] Fix rand's version bump Signed-off-by: Igor Gnatenko --- 0001-deps-update-quickcheck-to-0.6.patch | 2 +- 0002-deps-update-rand-to-0.4.patch | 6 +++--- 0003-deps-update-byteorder-to-1.patch | 2 +- 0004-deps-update-env_logger-to-0.4.patch | 2 +- 0005-deps-update-clap-to-2.patch | 2 +- 0006-deps-update-loopdev-to-0.2.patch | 2 +- stratisd.spec | 1 + 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/0001-deps-update-quickcheck-to-0.6.patch b/0001-deps-update-quickcheck-to-0.6.patch index 4f07cb0..dd66aa5 100644 --- a/0001-deps-update-quickcheck-to-0.6.patch +++ b/0001-deps-update-quickcheck-to-0.6.patch @@ -1,4 +1,4 @@ -From ad3b465955dc1cb261d086d5a3984103dbcec38a Mon Sep 17 00:00:00 2001 +From 54cdf6f34d96fcfc902bc153b6ca46db3195cf02 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 5 Jan 2018 21:36:00 +0100 Subject: [PATCH 1/6] deps: update quickcheck to 0.6 diff --git a/0002-deps-update-rand-to-0.4.patch b/0002-deps-update-rand-to-0.4.patch index 724348d..67e2d4f 100644 --- a/0002-deps-update-rand-to-0.4.patch +++ b/0002-deps-update-rand-to-0.4.patch @@ -1,4 +1,4 @@ -From b68c392d3d44b7d5ec1877b935f0ea7f1d26bb6d Mon Sep 17 00:00:00 2001 +From 48adfc646f088f7b94cbbb912dee71e2068d6dd6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 5 Jan 2018 21:38:12 +0100 Subject: [PATCH 2/6] deps: update rand to 0.4 @@ -23,7 +23,7 @@ index 5d7fceb..cab096a 100644 serde_derive = "1" serde_json = "1" diff --git a/src/engine/strat_engine/blockdevmgr.rs b/src/engine/strat_engine/blockdevmgr.rs -index 21996fe..1939910 100644 +index 21996fe..3d13fda 100644 --- a/src/engine/strat_engine/blockdevmgr.rs +++ b/src/engine/strat_engine/blockdevmgr.rs @@ -9,7 +9,7 @@ use std::fs::{File, OpenOptions}; @@ -41,7 +41,7 @@ index 21996fe..1939910 100644 // distribution of metadata over different paths. - let saved = sample(&mut thread_rng(), candidates, MAX_NUM_TO_WRITE) + let saved = seq::sample_iter(&mut thread_rng(), candidates, MAX_NUM_TO_WRITE) -+ .unwrap() ++ .unwrap_or_else(|e| e) .iter_mut() .fold(false, |acc, b| acc | b.save_state(&stamp_time, metadata).is_ok()); diff --git a/0003-deps-update-byteorder-to-1.patch b/0003-deps-update-byteorder-to-1.patch index 0ab71f3..df4d732 100644 --- a/0003-deps-update-byteorder-to-1.patch +++ b/0003-deps-update-byteorder-to-1.patch @@ -1,4 +1,4 @@ -From 76dd377729d592d626c15db87d3909a3faf3446d Mon Sep 17 00:00:00 2001 +From c2d1f403a3a00c0afff4bd10ef7b6374e7ac62f2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 5 Jan 2018 21:40:56 +0100 Subject: [PATCH 3/6] deps: update byteorder to 1 diff --git a/0004-deps-update-env_logger-to-0.4.patch b/0004-deps-update-env_logger-to-0.4.patch index 95de3bf..d72c5f3 100644 --- a/0004-deps-update-env_logger-to-0.4.patch +++ b/0004-deps-update-env_logger-to-0.4.patch @@ -1,4 +1,4 @@ -From 22e689d4fdbfb0f1d22353ccb63321700b5ccc25 Mon Sep 17 00:00:00 2001 +From 2e08305f111166b8f515dabbd73594c6447bc3b5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 5 Jan 2018 21:41:50 +0100 Subject: [PATCH 4/6] deps: update env_logger to 0.4 diff --git a/0005-deps-update-clap-to-2.patch b/0005-deps-update-clap-to-2.patch index cfcb7f3..624d534 100644 --- a/0005-deps-update-clap-to-2.patch +++ b/0005-deps-update-clap-to-2.patch @@ -1,4 +1,4 @@ -From 483ccb16bde93ab0342a7cfd63c5de1860b90d43 Mon Sep 17 00:00:00 2001 +From ba87ca3e47a4d5eb9dd32d49a25ac5b9b1345af6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 5 Jan 2018 21:44:00 +0100 Subject: [PATCH 5/6] deps: update clap to 2 diff --git a/0006-deps-update-loopdev-to-0.2.patch b/0006-deps-update-loopdev-to-0.2.patch index 91ffa41..afdfcc2 100644 --- a/0006-deps-update-loopdev-to-0.2.patch +++ b/0006-deps-update-loopdev-to-0.2.patch @@ -1,4 +1,4 @@ -From c4a37032ec71fc783204cf505508936dee513142 Mon Sep 17 00:00:00 2001 +From 893e01cf24b29a01dcf8640e24a070d606c7fae7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 5 Jan 2018 21:47:15 +0100 Subject: [PATCH 6/6] deps: update loopdev to 0.2 diff --git a/stratisd.spec b/stratisd.spec index 0a7b118..c37a6b5 100644 --- a/stratisd.spec +++ b/stratisd.spec @@ -93,6 +93,7 @@ mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_libexecdir}/stratisd * Mon Jan 08 2018 Igor Gnatenko - Move binary under %%{_libexecdir} - Add dbus service (so it is activatable) +- Fix rand's version bump * Sun Jan 07 2018 Igor Gnatenko - 0.1.4-1 - Initial package