From 3d428713c5cf5c399d7eb5853e53df71883e6d9a Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 21 Sep 2021 09:33:51 +0200 Subject: [PATCH] rename pbs-systemd to proxmox-systemd --- pbs-api-types/Cargo.toml | 2 +- pbs-api-types/src/jobs.rs | 8 ++++---- pbs-api-types/src/tape/media_pool.rs | 2 +- pbs-api-types/src/upid.rs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pbs-api-types/Cargo.toml b/pbs-api-types/Cargo.toml index 02c8c2d4..a64d7f0a 100644 --- a/pbs-api-types/Cargo.toml +++ b/pbs-api-types/Cargo.toml @@ -16,5 +16,5 @@ serde = { version = "1.0", features = ["derive"] } proxmox = { version = "0.13.3", default-features = false, features = [ "api-macro" ] } -pbs-systemd = { path = "../pbs-systemd" } +proxmox-systemd = { path = "../proxmox-systemd" } pbs-tools = { path = "../pbs-tools" } diff --git a/pbs-api-types/src/jobs.rs b/pbs-api-types/src/jobs.rs index 1526dbc4..a9c64779 100644 --- a/pbs-api-types/src/jobs.rs +++ b/pbs-api-types/src/jobs.rs @@ -25,25 +25,25 @@ pub const JOB_ID_SCHEMA: Schema = StringSchema::new("Job ID.") pub const SYNC_SCHEDULE_SCHEMA: Schema = StringSchema::new( "Run sync job at specified schedule.") - .format(&ApiStringFormat::VerifyFn(pbs_systemd::time::verify_calendar_event)) + .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event)) .type_text("") .schema(); pub const GC_SCHEDULE_SCHEMA: Schema = StringSchema::new( "Run garbage collection job at specified schedule.") - .format(&ApiStringFormat::VerifyFn(pbs_systemd::time::verify_calendar_event)) + .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event)) .type_text("") .schema(); pub const PRUNE_SCHEDULE_SCHEMA: Schema = StringSchema::new( "Run prune job at specified schedule.") - .format(&ApiStringFormat::VerifyFn(pbs_systemd::time::verify_calendar_event)) + .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event)) .type_text("") .schema(); pub const VERIFICATION_SCHEDULE_SCHEMA: Schema = StringSchema::new( "Run verify job at specified schedule.") - .format(&ApiStringFormat::VerifyFn(pbs_systemd::time::verify_calendar_event)) + .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event)) .type_text("") .schema(); diff --git a/pbs-api-types/src/tape/media_pool.rs b/pbs-api-types/src/tape/media_pool.rs index 53e46788..9e3d8b56 100644 --- a/pbs-api-types/src/tape/media_pool.rs +++ b/pbs-api-types/src/tape/media_pool.rs @@ -14,7 +14,7 @@ use proxmox::api::{ schema::{Schema, StringSchema, ApiStringFormat, Updater}, }; -use pbs_systemd::time::{parse_calendar_event, parse_time_span, CalendarEvent, TimeSpan}; +use proxmox_systemd::time::{parse_calendar_event, parse_time_span, CalendarEvent, TimeSpan}; use crate::{ PROXMOX_SAFE_ID_FORMAT, diff --git a/pbs-api-types/src/upid.rs b/pbs-api-types/src/upid.rs index 50d70b67..ba23a646 100644 --- a/pbs-api-types/src/upid.rs +++ b/pbs-api-types/src/upid.rs @@ -109,7 +109,7 @@ impl std::str::FromStr for UPID { let worker_id = if cap["wid"].is_empty() { None } else { - let wid = pbs_systemd::unescape_unit(&cap["wid"])?; + let wid = proxmox_systemd::unescape_unit(&cap["wid"])?; Some(wid) }; @@ -135,7 +135,7 @@ impl std::fmt::Display for UPID { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { let wid = if let Some(ref id) = self.worker_id { - pbs_systemd::escape_unit(id, false) + proxmox_systemd::escape_unit(id, false) } else { String::new() };