Update to 0.1.8

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
epel9
Michel Alexandre Salim 2 years ago
parent 8a85ca6256
commit e6fb582007
No known key found for this signature in database
GPG Key ID: 8B229D2F7CCC04F2

1
.gitignore vendored

@ -1 +1,2 @@
/pore-0.1.6.crate /pore-0.1.6.crate
/pore-0.1.8.crate

@ -1,28 +1,11 @@
--- pore-0.1.6/Cargo.toml 1970-01-01T00:00:01+00:00 --- pore-0.1.8/Cargo.toml 1970-01-01T00:00:01+00:00
+++ pore-0.1.6/Cargo.toml 2023-01-13T18:22:27.318872+00:00 +++ pore-0.1.8/Cargo.toml 2023-01-27T19:48:16.803773+00:00
@@ -31,8 +31,8 @@ @@ -47,7 +47,7 @@
[dependencies.console] version = "0.3"
version = "0.15.0"
-[dependencies.copy_dir] [dependencies.git2]
-version = "0.1.2" -version = "0.16"
+[dependencies.fs_extra] +version = "0.14"
+version = "1.2.0" features = ["vendored-libgit2"]
[dependencies.dirs]
version = "4.0.0"
@@ -50,11 +50,11 @@
[dependencies.indoc] [dependencies.indoc]
version = "1.0"
-[dependencies.isatty]
-version = "0.1.9"
+[dependencies.atty]
+version = "0.2"
[dependencies.joinery]
-version = "2.1.0"
+version = "3.0"
[dependencies.lazy_static]
version = "1.4.0"

@ -1,13 +0,0 @@
--- a/src/depot.rs
+++ b/src/depot.rs
@@ -104,7 +104,9 @@ impl Depot {
)
.context(format!("failed to create directory {:?}", dst))?;
- copy_dir::copy_dir(&src, &dst).context(format!("failed to copy directory {:?} to {:?}", src, dst))?;
+ let mut options = fs_extra::dir::CopyOptions::new();
+ options.copy_inside = true;
+ fs_extra::dir::copy(src, dst, &options).context(format!("failed to copy directory {:?} to {:?}", src, dst))?;
Ok(())
}

@ -1,19 +0,0 @@
--- a/src/main.rs
+++ b/src/main.rs
@@ -43,6 +43,7 @@ use std::path::{Path, PathBuf};
use std::sync::Arc;
use anyhow::{Context, Error};
+use atty::Stream;
use joinery::Joinable;
use progpool::{Job, Pool};
@@ -792,7 +793,7 @@ fn main() {
};
let mut pool = Pool::with_size(pool_size);
- let update_checker = if config.update_check && isatty::stdout_isatty() {
+ let update_checker = if config.update_check && atty::is(Stream::Stdout) {
Some(UpdateChecker::fetch())
} else {
None

@ -4,7 +4,7 @@
%global crate pore %global crate pore
Name: rust-pore Name: rust-pore
Version: 0.1.6 Version: 0.1.8
Release: %autorelease Release: %autorelease
Summary: Performance oriented reimplementation of repo Summary: Performance oriented reimplementation of repo
@ -12,14 +12,8 @@ License: Apache-2.0
URL: https://crates.io/crates/pore URL: https://crates.io/crates/pore
Source: %{crates_source} Source: %{crates_source}
# Manually created patch for downstream crate metadata changes # Manually created patch for downstream crate metadata changes
# - replace copy_dir with fs_extra # * downgrade git2 from 0.16 to 0.14
# - replace isatty with atty
# - bump joinery to 3.0
Patch: pore-fix-metadata.diff Patch: pore-fix-metadata.diff
# Based on merged https://github.com/jmgao/pore/pull/102
Patch: pore-replace-copy_dir.diff
# Based on merged https://github.com/jmT142411827gao/pore/pull/98
Patch: pore-replace-isatty.diff
BuildRequires: rust-packaging >= 21 BuildRequires: rust-packaging >= 21

@ -1 +1 @@
SHA512 (pore-0.1.6.crate) = aaa92a82f6d6340ee6ea911989f6bd3554ec7b4108144d1d3e699ed8c9fd81274d33d15b203dfa4a2e06123471bc23b25a35b95abd537003bc784c25a4dca343 SHA512 (pore-0.1.8.crate) = edec1137c748b66fea173a72b1e653e15e602c324b225400cc359248e79374d3e01c9684ed9262ab485fe66104ae6bf6fb28c307e29d6192042ee30db7ca61e3

Loading…
Cancel
Save