about summary refs log tree commit diff
path: root/pkgs/applications/backup/pika-backup/borg-path.patch
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2024-03-03 11:51:33 -0800
committerRobert Schütz <nix@dotlambda.de>2024-03-03 12:48:31 -0800
commitce1761fa5845c85aeeb665a392c60daadda20d48 (patch)
tree4b2bdcdb8eb48cbe68d005535cc51dd8a9eb4563 /pkgs/applications/backup/pika-backup/borg-path.patch
parent2ccf518e5933931893a5e5d19bc95fba3a958c13 (diff)
pika-backup: 0.6.2 -> 0.7.0
Diff: https://gitlab.gnome.org/World/pika-backup/-/compare/v0.6.2...v0.7.0

Changelog: https://gitlab.gnome.org/World/pika-backup/-/blob/v0.7.0/CHANGELOG.md
Diffstat (limited to 'pkgs/applications/backup/pika-backup/borg-path.patch')
-rw-r--r--pkgs/applications/backup/pika-backup/borg-path.patch17
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/applications/backup/pika-backup/borg-path.patch b/pkgs/applications/backup/pika-backup/borg-path.patch
index faa4b76cec7be..dc5d417d14800 100644
--- a/pkgs/applications/backup/pika-backup/borg-path.patch
+++ b/pkgs/applications/backup/pika-backup/borg-path.patch
@@ -1,22 +1,13 @@
 diff --git a/src/borg/process.rs b/src/borg/process.rs
-index 63ea0ee..e3535e0 100644
+index 9af8da7..85bcbf8 100644
 --- a/src/borg/process.rs
 +++ b/src/borg/process.rs
-@@ -203,7 +203,7 @@ impl BorgCall {
+@@ -278,7 +278,7 @@ impl BorgCall {
      }
  
-     pub fn cmd(&self) -> Result<process::Command> {
--        let mut cmd = process::Command::new("borg");
-+        let mut cmd = process::Command::new("@borg@");
- 
-         cmd.envs([self.set_password()?]);
- 
-@@ -221,7 +221,7 @@ impl BorgCall {
-     }
- 
-     pub fn cmd_async(&self) -> Result<async_process::Command> {
+     pub(super) fn command(&self) -> Result<(async_process::Command, UnixStream)> {
 -        let mut cmd = async_process::Command::new("borg");
 +        let mut cmd = async_process::Command::new("@borg@");
  
-         cmd.envs([self.set_password()?]);
+         let unix_stream = self.stream_password(&mut cmd)?;