From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-backup-qemu 1/2] update deps to pbs 2.1.1
Date: Wed, 24 Nov 2021 09:18:12 +0100 [thread overview]
Message-ID: <20211124081813.1559447-1-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20211105121909.2957236-1-dietmar@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@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
next prev parent reply other threads:[~2021-11-24 8:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 12:19 [pve-devel] [proxmox-backup-qemu] update dependencies to latest proxmox-backup git version Dietmar Maurer
2021-11-24 8:18 ` Fabian Grünbichler [this message]
2021-11-24 8:18 ` [pve-devel] [PATCH proxmox-backup-qemu 2/2] fix clippy warnings Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211124081813.1559447-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.