[pve-devel] [PATCH proxmox-backup-qemu 1/2] update deps to pbs 2.1.1

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbich...@proxmox.com>
---
on top of the patch by dietmar

 Cargo.toml     | 14 +++++++-------
 src/backup.rs  |  2 +-
 src/lib.rs     |  2 +-
 src/restore.rs |  3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d9a7de1..b98e8ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,15 +28,15 @@ libc = "0.2"
 once_cell = "1.5"
 openssl = "0.10"
 proxmox = { version = "0.15.0", features = [ "sortable-macro"] }
-proxmox-schema = { version = "1", features = [ "api-macro" ] }
+proxmox-async = "0.2"
 proxmox-lang = "1"
+proxmox-schema = { version = "1", features = [ "api-macro" ] }
 
-pbs-runtime = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = 
"2bc1250c28de0ecf595b9933af9f900cbee52fdc" }
-pbs-api-types = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = 
"2bc1250c28de0ecf595b9933af9f900cbee52fdc" }
-pbs-tools = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = 
"2bc1250c28de0ecf595b9933af9f900cbee52fdc" }
-pbs-config = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = 
"2bc1250c28de0ecf595b9933af9f900cbee52fdc" }
-pbs-datastore = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = 
"2bc1250c28de0ecf595b9933af9f900cbee52fdc" }
-pbs-client = { git = "git://git.proxmox.com/git/proxmox-backup.git" , rev = 
"2bc1250c28de0ecf595b9933af9f900cbee52fdc" }
+pbs-api-types = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = 
"064497756e6212792d38ebddf6c1d4419638deec" }
+pbs-tools = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = 
"064497756e6212792d38ebddf6c1d4419638deec" }
+pbs-config = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = 
"064497756e6212792d38ebddf6c1d4419638deec" }
+pbs-datastore = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = 
"064497756e6212792d38ebddf6c1d4419638deec" }
+pbs-client = { git = "git://git.proxmox.com/git/proxmox-backup.git" , rev = 
"064497756e6212792d38ebddf6c1d4419638deec" }
 
 serde_json = "1.0"
 tokio = { version = "1.6", features = [ "fs", "io-util", "macros", "net", 
"rt-multi-thread", "signal", "time" ] }
diff --git a/src/backup.rs b/src/backup.rs
index 186730f..b3ca21d 100644
--- a/src/backup.rs
+++ b/src/backup.rs
@@ -8,8 +8,8 @@ use futures::future::{Future, Either, FutureExt};
 use tokio::runtime::Runtime;
 
 use proxmox::tools::fs::file_get_contents;
+use proxmox_async::runtime::get_runtime_with_builder;
 
-use pbs_runtime::get_runtime_with_builder;
 use pbs_api_types::CryptMode;
 use pbs_tools::crypt_config::CryptConfig;
 use pbs_config::key_config::{KeyConfig, load_and_decrypt_key, 
rsa_encrypt_key_config};
diff --git a/src/lib.rs b/src/lib.rs
index 436a592..bfc379d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -842,7 +842,7 @@ pub extern "C" fn proxmox_restore_image(
             callback(callback_data, offset, std::ptr::null(), len)
         };
 
-        pbs_runtime::block_on(
+        proxmox_async::runtime::block_on(
             restore_task.restore_image(archive_name, write_data_callback, 
write_zero_callback, verbose)
         )?;
 
diff --git a/src/restore.rs b/src/restore.rs
index e034aa2..2bc86c9 100644
--- a/src/restore.rs
+++ b/src/restore.rs
@@ -5,7 +5,8 @@ use anyhow::{format_err, bail, Error};
 use once_cell::sync::OnceCell;
 use tokio::runtime::Runtime;
 
-use pbs_runtime::get_runtime_with_builder;
+use proxmox_async::runtime::get_runtime_with_builder;
+
 use pbs_tools::crypt_config::CryptConfig;
 use pbs_config::key_config::load_and_decrypt_key;
 use pbs_datastore::BackupManifest;
-- 
2.30.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel