summaryrefslogtreecommitdiff
path: root/src/cmd
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2024-03-03 18:28:05 +0000
committerLars Wirzenius <liw@liw.fi>2024-03-03 18:28:05 +0000
commit24ebad6ff9c21cee0932aae2b461877ef0dca58f (patch)
tree39538ec5075e3dd56c2e297a484d13e802930df2 /src/cmd
parent1e8cbe13ac1872760b49a3b9b077174b652b230f (diff)
parentdf85f13f0ddea078837d4e1e79439c7dfee9025a (diff)
downloadobnam2-main.tar.gz
Merge branch 'update' into 'main'HEADmain
update crate dependencies to current ones See merge request obnam/obnam!254
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/init.rs2
-rw-r--r--src/cmd/restore.rs6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/cmd/init.rs b/src/cmd/init.rs
index 1310f66..5950fbb 100644
--- a/src/cmd/init.rs
+++ b/src/cmd/init.rs
@@ -20,7 +20,7 @@ impl Init {
pub fn run(&self, config: &ClientConfig) -> Result<(), ObnamError> {
let passphrase = match &self.insecure_passphrase {
Some(x) => x.to_string(),
- None => rpassword::read_password_from_tty(Some(PROMPT)).unwrap(),
+ None => rpassword::prompt_password(PROMPT).unwrap(),
};
let passwords = Passwords::new(&passphrase);
diff --git a/src/cmd/restore.rs b/src/cmd/restore.rs
index dff72fa..58caf61 100644
--- a/src/cmd/restore.rs
+++ b/src/cmd/restore.rs
@@ -306,6 +306,10 @@ fn create_progress_bar(file_count: FileId, verbose: bool) -> ProgressBar {
"current: {wide_msg}",
"{spinner}",
];
- progress.set_style(ProgressStyle::default_bar().template(&parts.join("\n")));
+ progress.set_style(
+ ProgressStyle::default_bar()
+ .template(&parts.join("\n"))
+ .expect("create indicatif ProgressStyle value"),
+ );
progress
}