From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DC38D6A79E for ; Fri, 17 Sep 2021 13:56:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DA6CD2F2C0 for ; Fri, 17 Sep 2021 13:56:17 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 2A4A42F28C for ; Fri, 17 Sep 2021 13:56:15 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 368BA44948 for ; Fri, 17 Sep 2021 13:56:09 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 17 Sep 2021 13:56:02 +0200 Message-Id: <20210917115607.135162-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917115607.135162-1-d.csapak@proxmox.com> References: <20210917115607.135162-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.379 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs, inspect.rs, mod.rs, recover.rs, proxmox-backup-debug.rs] Subject: [pbs-devel] [PATCH proxmox-backup v3 2/7] move proxmox-backup-debug back to main crate X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2021 11:56:17 -0000 we want to add something to it that needs access to the proxmox_backup::api2 stuff, so it cannot live in a sub crate Signed-off-by: Dominik Csapak --- Cargo.toml | 1 - Makefile | 2 -- debian/proxmox-backup-debug.bash-completion | 1 - debian/proxmox-backup-server.bash-completion | 1 + proxmox-backup-debug/Cargo.toml | 18 ------------------ .../main.rs => src/bin/proxmox-backup-debug.rs | 4 ++-- .../bin/proxmox_backup_debug}/inspect.rs | 0 src/bin/proxmox_backup_debug/mod.rs | 2 ++ .../bin/proxmox_backup_debug}/recover.rs | 0 9 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 debian/proxmox-backup-debug.bash-completion delete mode 100644 proxmox-backup-debug/Cargo.toml rename proxmox-backup-debug/src/main.rs => src/bin/proxmox-backup-debug.rs (86%) rename {proxmox-backup-debug/src => src/bin/proxmox_backup_debug}/inspect.rs (100%) create mode 100644 src/bin/proxmox_backup_debug/mod.rs rename {proxmox-backup-debug/src => src/bin/proxmox_backup_debug}/recover.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 72d786c9..73159c3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,6 @@ members = [ "proxmox-backup-banner", "proxmox-backup-client", - "proxmox-backup-debug", "proxmox-file-restore", "pxar-bin", ] diff --git a/Makefile b/Makefile index e6c85a2e..f754f350 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,6 @@ SUBCRATES := \ pbs-tools \ proxmox-backup-banner \ proxmox-backup-client \ - proxmox-backup-debug \ proxmox-file-restore \ pxar-bin @@ -179,7 +178,6 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do- --bin proxmox-backup-banner \ --package proxmox-backup-client \ --bin proxmox-backup-client \ - --package proxmox-backup-debug \ --bin proxmox-backup-debug \ --package proxmox-file-restore \ --bin proxmox-file-restore \ diff --git a/debian/proxmox-backup-debug.bash-completion b/debian/proxmox-backup-debug.bash-completion deleted file mode 100644 index b977f953..00000000 --- a/debian/proxmox-backup-debug.bash-completion +++ /dev/null @@ -1 +0,0 @@ -debian/proxmox-backup-debug.bc proxmox-backup-debug diff --git a/debian/proxmox-backup-server.bash-completion b/debian/proxmox-backup-server.bash-completion index a2165699..d4257edd 100644 --- a/debian/proxmox-backup-server.bash-completion +++ b/debian/proxmox-backup-server.bash-completion @@ -1,4 +1,5 @@ debian/proxmox-backup-manager.bc proxmox-backup-manager +debian/proxmox-backup-debug.bc proxmox-backup-debug debian/proxmox-tape.bc proxmox-tape debian/pmtx.bc pmtx debian/pmt.bc pmt diff --git a/proxmox-backup-debug/Cargo.toml b/proxmox-backup-debug/Cargo.toml deleted file mode 100644 index 7f1f596d..00000000 --- a/proxmox-backup-debug/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "proxmox-backup-debug" -version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2018" - -[dependencies] -anyhow = "1.0" -walkdir = "2" -serde_json = "1.0" - -proxmox = { version = "0.13.0", features = [ "api-macro", "cli" ] } - -pbs-config = { path = "../pbs-config" } -pbs-client = { path = "../pbs-client" } -pbs-datastore = { path = "../pbs-datastore" } -pbs-runtime = { path = "../pbs-runtime" } -pbs-tools = { path = "../pbs-tools" } diff --git a/proxmox-backup-debug/src/main.rs b/src/bin/proxmox-backup-debug.rs similarity index 86% rename from proxmox-backup-debug/src/main.rs rename to src/bin/proxmox-backup-debug.rs index b768f57a..4d6164ef 100644 --- a/proxmox-backup-debug/src/main.rs +++ b/src/bin/proxmox-backup-debug.rs @@ -1,7 +1,7 @@ use proxmox::api::cli::{run_cli_command, CliCommandMap, CliEnvironment}; -mod inspect; -mod recover; +mod proxmox_backup_debug; +use proxmox_backup_debug::*; fn main() { let cmd_def = CliCommandMap::new() diff --git a/proxmox-backup-debug/src/inspect.rs b/src/bin/proxmox_backup_debug/inspect.rs similarity index 100% rename from proxmox-backup-debug/src/inspect.rs rename to src/bin/proxmox_backup_debug/inspect.rs diff --git a/src/bin/proxmox_backup_debug/mod.rs b/src/bin/proxmox_backup_debug/mod.rs new file mode 100644 index 00000000..bbaca751 --- /dev/null +++ b/src/bin/proxmox_backup_debug/mod.rs @@ -0,0 +1,2 @@ +pub mod inspect; +pub mod recover; diff --git a/proxmox-backup-debug/src/recover.rs b/src/bin/proxmox_backup_debug/recover.rs similarity index 100% rename from proxmox-backup-debug/src/recover.rs rename to src/bin/proxmox_backup_debug/recover.rs -- 2.30.2