* [pbs-devel] [PATCH backup 1/5] fix typos in comments
@ 2024-08-07 10:32 Maximiliano Sandoval
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 2/5] fix typos in rust documentation blocks Maximiliano Sandoval
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Maximiliano Sandoval @ 2024-08-07 10:32 UTC (permalink / raw)
To: pbs-devel
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
debian/proxmox-backup-file-restore.postinst | 2 +-
pbs-tape/src/sg_tape/encryption.rs | 2 +-
pbs-tools/src/crypt_config.rs | 2 +-
src/tape/test/alloc_writable_media.rs | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/proxmox-backup-file-restore.postinst b/debian/proxmox-backup-file-restore.postinst
index 9792bfb4..c73893dd 100755
--- a/debian/proxmox-backup-file-restore.postinst
+++ b/debian/proxmox-backup-file-restore.postinst
@@ -9,7 +9,7 @@ update_initramfs() {
CACHE_PATH_DBG="/var/cache/proxmox-backup/file-restore-initramfs-debug.img"
# cleanup first, in case proxmox-file-restore was uninstalled since we do
- # not want an unuseable image lying around
+ # not want an unusable image lying around
rm -f "$CACHE_PATH"
if [ ! -f "$INST_PATH/initramfs.img" ]; then
diff --git a/pbs-tape/src/sg_tape/encryption.rs b/pbs-tape/src/sg_tape/encryption.rs
index 9fafb62a..19444d28 100644
--- a/pbs-tape/src/sg_tape/encryption.rs
+++ b/pbs-tape/src/sg_tape/encryption.rs
@@ -236,7 +236,7 @@ struct SspDataEncryptionAlgorithmDescriptor {
algorithm_code: u32,
}
-// Returns the algorythm_index for AES-GCM
+// Returns the algorithm_index for AES-GCM
fn decode_spin_data_encryption_caps(data: &[u8]) -> Result<u8, Error> {
proxmox_lang::try_block!({
let mut reader = data;
diff --git a/pbs-tools/src/crypt_config.rs b/pbs-tools/src/crypt_config.rs
index cbf74190..6ea46b57 100644
--- a/pbs-tools/src/crypt_config.rs
+++ b/pbs-tools/src/crypt_config.rs
@@ -26,7 +26,7 @@ const FINGERPRINT_INPUT: [u8; 32] = [
pub struct CryptConfig {
// the Cipher
cipher: Cipher,
- // A secrect key use to provide the chunk digest name space.
+ // A secret key use to provide the chunk digest name space.
id_key: [u8; 32],
// Openssl hmac PKey of id_key
id_pkey: openssl::pkey::PKey<openssl::pkey::Private>,
diff --git a/src/tape/test/alloc_writable_media.rs b/src/tape/test/alloc_writable_media.rs
index dbc1b0c7..ff9a6348 100644
--- a/src/tape/test/alloc_writable_media.rs
+++ b/src/tape/test/alloc_writable_media.rs
@@ -1,4 +1,4 @@
-// Tape Media Pool tests - test allow_ritable_media() function
+// Tape Media Pool tests - test allow_writable_media() function
//
// # cargo test --release tape::test::alloc_writable_media
--
2.39.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [pbs-devel] [PATCH backup 2/5] fix typos in rust documentation blocks
2024-08-07 10:32 [pbs-devel] [PATCH backup 1/5] fix typos in comments Maximiliano Sandoval
@ 2024-08-07 10:32 ` Maximiliano Sandoval
2024-08-07 10:49 ` Gabriel Goller
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 3/5] fix typos in docs an manual pages Maximiliano Sandoval
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Maximiliano Sandoval @ 2024-08-07 10:32 UTC (permalink / raw)
To: pbs-devel
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
pbs-api-types/src/acl.rs | 2 +-
pbs-client/src/pxar/create.rs | 2 +-
pbs-config/src/cached_user_info.rs | 2 +-
pbs-tools/src/lib.rs | 2 +-
proxmox-backup-client/src/benchmark.rs | 2 +-
proxmox-file-restore/src/block_driver.rs | 2 +-
src/api2/backup/environment.rs | 2 +-
src/api2/node/services.rs | 2 +-
src/api2/reader/environment.rs | 2 +-
src/tape/file_formats/mod.rs | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pbs-api-types/src/acl.rs b/pbs-api-types/src/acl.rs
index ef639862..e133247d 100644
--- a/pbs-api-types/src/acl.rs
+++ b/pbs-api-types/src/acl.rs
@@ -223,7 +223,7 @@ pub enum Role {
RemoteAudit = ROLE_REMOTE_AUDIT,
/// Remote Administrator
RemoteAdmin = ROLE_REMOTE_ADMIN,
- /// Syncronisation Opertator
+ /// Synchronization Opertator
RemoteSyncOperator = ROLE_REMOTE_SYNC_OPERATOR,
/// Tape Auditor
TapeAudit = ROLE_TAPE_AUDIT,
diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs
index 4dd3b656..c48524c4 100644
--- a/pbs-client/src/pxar/create.rs
+++ b/pbs-client/src/pxar/create.rs
@@ -62,7 +62,7 @@ pub struct PxarCreateOptions {
pub type MetadataArchiveReader = Arc<dyn ReadAt + Send + Sync + 'static>;
-/// Statefull information of previous backups snapshots for partial backups
+/// Stateful information of previous backups snapshots for partial backups
pub struct PxarPrevRef {
/// Reference accessor for metadata comparison
pub accessor: Accessor<MetadataArchiveReader>,
diff --git a/pbs-config/src/cached_user_info.rs b/pbs-config/src/cached_user_info.rs
index b9534b80..f8ecb6c1 100644
--- a/pbs-config/src/cached_user_info.rs
+++ b/pbs-config/src/cached_user_info.rs
@@ -179,7 +179,7 @@ impl CachedUserInfo {
(privs, propagated_privs)
}
- /// Checks whether the `auth_id` has any of the privilegs `privs` on any object below `path`.
+ /// Checks whether the `auth_id` has any of the privileges `privs` on any object below `path`.
pub fn any_privs_below(
&self,
auth_id: &Authid,
diff --git a/pbs-tools/src/lib.rs b/pbs-tools/src/lib.rs
index bee5c1c0..af900c92 100644
--- a/pbs-tools/src/lib.rs
+++ b/pbs-tools/src/lib.rs
@@ -10,7 +10,7 @@ pub mod async_lru_cache;
/// Set MMAP_THRESHOLD to a fixed value (128 KiB)
///
-/// This avoids the "dynamic" mmap-treshold logic from glibc's malloc, which seems misguided and
+/// This avoids the "dynamic" mmap-threshold logic from glibc's malloc, which seems misguided and
/// effectively avoids using mmap for all allocations smaller than 32 MiB. Which, in combination
/// with the allocation pattern from our/tokio's complex async machinery, resulted in very large
/// RSS sizes due to defragmentation and long-living (smaller) allocation on top of the heap
diff --git a/proxmox-backup-client/src/benchmark.rs b/proxmox-backup-client/src/benchmark.rs
index 2145d45e..a6f24d74 100644
--- a/proxmox-backup-client/src/benchmark.rs
+++ b/proxmox-backup-client/src/benchmark.rs
@@ -29,7 +29,7 @@ use crate::{
#[derive(Copy, Clone, Serialize)]
/// Speed test result
struct Speed {
- /// The meassured speed in Bytes/second
+ /// The measured speed in Bytes/second
#[serde(skip_serializing_if = "Option::is_none")]
speed: Option<f64>,
/// Top result we want to compare with
diff --git a/proxmox-file-restore/src/block_driver.rs b/proxmox-file-restore/src/block_driver.rs
index fa954832..56b868b5 100644
--- a/proxmox-file-restore/src/block_driver.rs
+++ b/proxmox-file-restore/src/block_driver.rs
@@ -37,7 +37,7 @@ pub type Async<R> = Pin<Box<dyn Future<Output = R> + Send>>;
/// An abstract implementation for retrieving data out of a block file backup
pub trait BlockRestoreDriver {
- /// List ArchiveEntrys for the given image file and path
+ /// List ArchiveEntries for the given image file and path
fn data_list(
&self,
details: SnapRestoreDetails,
diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs
index 51f4a15b..0a7c67b6 100644
--- a/src/api2/backup/environment.rs
+++ b/src/api2/backup/environment.rs
@@ -101,7 +101,7 @@ impl SharedBackupState {
}
}
-/// `RpcEnvironmet` implementation for backup service
+/// `RpcEnvironment` implementation for backup service
#[derive(Clone)]
pub struct BackupEnvironment {
env_type: RpcEnvironmentType,
diff --git a/src/api2/node/services.rs b/src/api2/node/services.rs
index a8db0e27..2da9e1ad 100644
--- a/src/api2/node/services.rs
+++ b/src/api2/node/services.rs
@@ -306,7 +306,7 @@ fn stop_service(
permission: &Permission::Privilege(&["system", "services", "{service}"], PRIV_SYS_MODIFY, false),
},
)]
-/// Retart service.
+/// Restart service.
fn restart_service(
service: String,
_param: Value,
diff --git a/src/api2/reader/environment.rs b/src/api2/reader/environment.rs
index 37039da2..602c65e4 100644
--- a/src/api2/reader/environment.rs
+++ b/src/api2/reader/environment.rs
@@ -11,7 +11,7 @@ use pbs_datastore::DataStore;
use proxmox_rest_server::formatter::*;
use proxmox_rest_server::WorkerTask;
-/// `RpcEnvironmet` implementation for backup reader service
+/// `RpcEnvironment` implementation for backup reader service
#[derive(Clone)]
pub struct ReaderEnvironment {
env_type: RpcEnvironmentType,
diff --git a/src/tape/file_formats/mod.rs b/src/tape/file_formats/mod.rs
index 0f983059..b1d8c455 100644
--- a/src/tape/file_formats/mod.rs
+++ b/src/tape/file_formats/mod.rs
@@ -150,7 +150,7 @@ pub struct MediaSetLabel {
pub seq_nr: u64,
/// Creation time stamp
pub ctime: i64,
- /// Encryption key finkerprint (if encryped)
+ /// Encryption key finkerprint (if encrypted)
#[serde(skip_serializing_if = "Option::is_none")]
pub encryption_key_fingerprint: Option<Fingerprint>,
}
--
2.39.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [pbs-devel] [PATCH backup 3/5] fix typos in docs an manual pages
2024-08-07 10:32 [pbs-devel] [PATCH backup 1/5] fix typos in comments Maximiliano Sandoval
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 2/5] fix typos in rust documentation blocks Maximiliano Sandoval
@ 2024-08-07 10:32 ` Maximiliano Sandoval
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 4/5] fix typos in strings Maximiliano Sandoval
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 5/5] fix typos in variables and function names Maximiliano Sandoval
3 siblings, 0 replies; 10+ messages in thread
From: Maximiliano Sandoval @ 2024-08-07 10:32 UTC (permalink / raw)
To: pbs-devel
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
docs/config/notifications-priv/man5.rst | 2 +-
docs/config/notifications/man5.rst | 2 +-
docs/user-management.rst | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/config/notifications-priv/man5.rst b/docs/config/notifications-priv/man5.rst
index 827c8ac7..ef6fed6c 100644
--- a/docs/config/notifications-priv/man5.rst
+++ b/docs/config/notifications-priv/man5.rst
@@ -8,7 +8,7 @@ Description
===========
The file /etc/proxmox-backup/notifications-priv.cfg is a configuration file
-for Proxmox Backup Server. It contains the configration for the
+for Proxmox Backup Server. It contains the configuration for the
notification system configuration.
File Format
diff --git a/docs/config/notifications/man5.rst b/docs/config/notifications/man5.rst
index 96844162..279378d1 100644
--- a/docs/config/notifications/man5.rst
+++ b/docs/config/notifications/man5.rst
@@ -8,7 +8,7 @@ Description
===========
The file /etc/proxmox-backup/notifications.cfg is a configuration file
-for Proxmox Backup Server. It contains the configration for the
+for Proxmox Backup Server. It contains the configuration for the
notification system configuration.
File Format
diff --git a/docs/user-management.rst b/docs/user-management.rst
index 9c03fc79..c670cbf6 100644
--- a/docs/user-management.rst
+++ b/docs/user-management.rst
@@ -663,7 +663,7 @@ address must be specified. Most options from :ref:`user_realms_ldap` apply to
Active Directory as well, most importantly the bind credentials ``bind-dn``
and ``password``. This is typically required by default for Microsoft Active
Directory. The ``bind-dn`` can be specified either in AD-specific
-``user@company.net`` syntax or the commen LDAP-DN syntax.
+``user@company.net`` syntax or the common LDAP-DN syntax.
The authentication domain name must only be specified if anonymous bind is
requested. If bind credentials are given, the domain name is automatically
--
2.39.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [pbs-devel] [PATCH backup 4/5] fix typos in strings
2024-08-07 10:32 [pbs-devel] [PATCH backup 1/5] fix typos in comments Maximiliano Sandoval
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 2/5] fix typos in rust documentation blocks Maximiliano Sandoval
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 3/5] fix typos in docs an manual pages Maximiliano Sandoval
@ 2024-08-07 10:32 ` Maximiliano Sandoval
2024-08-07 10:52 ` Lukas Wagner
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 5/5] fix typos in variables and function names Maximiliano Sandoval
3 siblings, 1 reply; 10+ messages in thread
From: Maximiliano Sandoval @ 2024-08-07 10:32 UTC (permalink / raw)
To: pbs-devel
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
docs/lto-barcode/page-calibration.js | 8 ++++----
pbs-api-types/src/ldap.rs | 2 +-
src/api2/node/tasks.rs | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/lto-barcode/page-calibration.js b/docs/lto-barcode/page-calibration.js
index 3c7fed82..54512a9f 100644
--- a/docs/lto-barcode/page-calibration.js
+++ b/docs/lto-barcode/page-calibration.js
@@ -108,7 +108,7 @@ Ext.define('PageCalibration', {
xtype: 'numberfield',
value: 'a4',
name: 's_x',
- fieldLabel: 'Meassured Start Offset Sx (mm)',
+ fieldLabel: 'Measured Start Offset Sx (mm)',
allowBlank: false,
labelWidth: 200,
},
@@ -116,7 +116,7 @@ Ext.define('PageCalibration', {
xtype: 'numberfield',
value: 'a4',
name: 'd_x',
- fieldLabel: 'Meassured Length Dx (mm)',
+ fieldLabel: 'Measured Length Dx (mm)',
allowBlank: false,
labelWidth: 200,
},
@@ -124,7 +124,7 @@ Ext.define('PageCalibration', {
xtype: 'numberfield',
value: 'a4',
name: 's_y',
- fieldLabel: 'Meassured Start Offset Sy (mm)',
+ fieldLabel: 'Measured Start Offset Sy (mm)',
allowBlank: false,
labelWidth: 200,
},
@@ -132,7 +132,7 @@ Ext.define('PageCalibration', {
xtype: 'numberfield',
value: 'a4',
name: 'd_y',
- fieldLabel: 'Meassured Length Dy (mm)',
+ fieldLabel: 'Measured Length Dy (mm)',
allowBlank: false,
labelWidth: 200,
},
diff --git a/pbs-api-types/src/ldap.rs b/pbs-api-types/src/ldap.rs
index f3df90a0..a3e0407b 100644
--- a/pbs-api-types/src/ldap.rs
+++ b/pbs-api-types/src/ldap.rs
@@ -149,7 +149,7 @@ pub const SYNC_DEFAULTS_STRING_SCHEMA: Schema = StringSchema::new("sync defaults
.schema();
const REMOVE_VANISHED_DESCRIPTION: &str =
- "A semicolon-seperated list of things to remove when they or the user \
+ "A semicolon-separated list of things to remove when they or the user \
vanishes during user synchronization. The following values are possible: ``entry`` removes the \
user when not returned from the sync; ``properties`` removes any \
properties on existing user that do not appear in the source. \
diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs
index 8f08d3af..069613ad 100644
--- a/src/api2/node/tasks.rs
+++ b/src/api2/node/tasks.rs
@@ -252,7 +252,7 @@ fn into_task_list_item(info: proxmox_rest_server::TaskListInfo) -> pbs_api_types
exitstatus: {
type: String,
optional: true,
- description: "'OK', 'Error: <msg>', or 'unkwown'.",
+ description: "'OK', 'Error: <msg>', or 'unknown'.",
},
},
},
--
2.39.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [pbs-devel] [PATCH backup 5/5] fix typos in variables and function names
2024-08-07 10:32 [pbs-devel] [PATCH backup 1/5] fix typos in comments Maximiliano Sandoval
` (2 preceding siblings ...)
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 4/5] fix typos in strings Maximiliano Sandoval
@ 2024-08-07 10:32 ` Maximiliano Sandoval
3 siblings, 0 replies; 10+ messages in thread
From: Maximiliano Sandoval @ 2024-08-07 10:32 UTC (permalink / raw)
To: pbs-devel
Variables, methods and functions in public API were not changed.
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
pbs-tape/src/sg_pt_changer.rs | 2 +-
pbs-tape/src/sg_tape/encryption.rs | 12 ++++++------
pbs-tape/src/sg_tape/report_density.rs | 4 ++--
proxmox-file-restore/src/qemu_helper.rs | 4 ++--
src/bin/proxmox_backup_debug/diff.rs | 16 ++++++++--------
src/traffic_control_cache.rs | 4 ++--
www/NavigationTree.js | 4 ++--
www/config/PruneAndGC.js | 4 ++--
www/datastore/Notes.js | 2 +-
www/datastore/Panel.js | 2 +-
www/window/NotificationMatcherOverride.js | 8 ++++----
11 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/pbs-tape/src/sg_pt_changer.rs b/pbs-tape/src/sg_pt_changer.rs
index 4825e36f..b600a49d 100644
--- a/pbs-tape/src/sg_pt_changer.rs
+++ b/pbs-tape/src/sg_pt_changer.rs
@@ -52,7 +52,7 @@ struct AddressAssignmentPage {
storage_element_count: u16,
first_import_export_element_address: u16,
import_export_element_count: u16,
- first_tranfer_element_address: u16,
+ first_transfer_element_address: u16,
transfer_element_count: u16,
reserved22: u8,
reserved23: u8,
diff --git a/pbs-tape/src/sg_tape/encryption.rs b/pbs-tape/src/sg_tape/encryption.rs
index 19444d28..7247d257 100644
--- a/pbs-tape/src/sg_tape/encryption.rs
+++ b/pbs-tape/src/sg_tape/encryption.rs
@@ -76,7 +76,7 @@ struct SspSetDataEncryptionPage {
control_byte_5: u8,
encryption_mode: u8,
decryption_mode: u8,
- algorythm_index: u8,
+ algorithm_index: u8,
key_format: u8,
reserved: [u8; 8],
key_len: u16,
@@ -86,7 +86,7 @@ struct SspSetDataEncryptionPage {
#[allow(clippy::vec_init_then_push)]
fn sg_spout_set_encryption<F: AsRawFd>(
file: &mut F,
- algorythm_index: u8,
+ algorithm_index: u8,
key: Option<[u8; 32]>,
) -> Result<(), Error> {
let mut sg_raw = SgRaw::new(file, 0)?;
@@ -106,7 +106,7 @@ fn sg_spout_set_encryption<F: AsRawFd>(
control_byte_5: (chok << 2),
encryption_mode: if key.is_some() { 2 } else { 0 },
decryption_mode: if key.is_some() { 3 } else { 0 }, // mixed mode
- algorythm_index,
+ algorithm_index,
key_format: 0,
reserved: [0u8; 8],
key_len: if let Some(ref key) = key {
@@ -221,7 +221,7 @@ struct SspDataEncryptionCapabilityPage {
#[derive(Endian)]
#[repr(C, packed)]
struct SspDataEncryptionAlgorithmDescriptor {
- algorythm_index: u8,
+ algorithm_index: u8,
reserved1: u8,
descriptor_len: u16,
control_byte_4: u8,
@@ -259,7 +259,7 @@ fn decode_spin_data_encryption_caps(data: &[u8]) -> Result<u8, Error> {
continue; // can't decrypt in hardware
}
if desc.algorithm_code == 0x00010014 && desc.key_size == 32 {
- aes_gcm_index = Some(desc.algorythm_index);
+ aes_gcm_index = Some(desc.algorithm_index);
break;
}
}
@@ -280,7 +280,7 @@ struct SspDataEncryptionStatusPage {
scope_byte: u8,
encryption_mode: u8,
decryption_mode: u8,
- algorythm_index: u8,
+ algorithm_index: u8,
key_instance_counter: u32,
control_byte: u8,
key_format: u8,
diff --git a/pbs-tape/src/sg_tape/report_density.rs b/pbs-tape/src/sg_tape/report_density.rs
index 57b75323..74596b7b 100644
--- a/pbs-tape/src/sg_tape/report_density.rs
+++ b/pbs-tape/src/sg_tape/report_density.rs
@@ -9,7 +9,7 @@ use crate::sgutils2::SgRaw;
#[repr(C, packed)]
#[derive(Endian)]
-struct DesnityDescriptorBlock {
+struct DensityDescriptorBlock {
primary_density_code: u8,
secondary_density_code: u8,
flags2: u8,
@@ -58,7 +58,7 @@ pub fn report_density<F: AsRawFd>(file: &mut F) -> Result<u8, Error> {
if reader.is_empty() {
break;
}
- let block: DesnityDescriptorBlock = unsafe { reader.read_be_value()? };
+ let block: DensityDescriptorBlock = unsafe { reader.read_be_value()? };
if block.primary_density_code > max_density {
max_density = block.primary_density_code;
}
diff --git a/proxmox-file-restore/src/qemu_helper.rs b/proxmox-file-restore/src/qemu_helper.rs
index 6112822a..471010aa 100644
--- a/proxmox-file-restore/src/qemu_helper.rs
+++ b/proxmox-file-restore/src/qemu_helper.rs
@@ -51,7 +51,7 @@ fn create_restore_log_dir() -> Result<String, Error> {
Ok(logpath)
}
-fn validate_img_existance(debug: bool) -> Result<(), Error> {
+fn validate_img_existence(debug: bool) -> Result<(), Error> {
let kernel = PathBuf::from(pbs_buildcfg::PROXMOX_BACKUP_KERNEL_FN);
let initramfs = PathBuf::from(if debug {
pbs_buildcfg::PROXMOX_BACKUP_INITRAMFS_DBG_FN
@@ -213,7 +213,7 @@ pub async fn start_vm(
let debug = debug_mode();
- validate_img_existance(debug)?;
+ validate_img_existence(debug)?;
let pid;
let (mut pid_file, pid_path) =
diff --git a/src/bin/proxmox_backup_debug/diff.rs b/src/bin/proxmox_backup_debug/diff.rs
index e6767c17..b0436d04 100644
--- a/src/bin/proxmox_backup_debug/diff.rs
+++ b/src/bin/proxmox_backup_debug/diff.rs
@@ -787,7 +787,7 @@ impl FileEntryPrinter {
Ok(())
}
- fn write_column_seperator(&mut self) -> Result<(), Error> {
+ fn write_column_separator(&mut self) -> Result<(), Error> {
write!(self.stream, " ")?;
Ok(())
}
@@ -800,25 +800,25 @@ impl FileEntryPrinter {
operation: FileOperation,
) -> Result<(), Error> {
self.write_operation(operation)?;
- self.write_column_seperator()?;
+ self.write_column_separator()?;
self.write_entry_type(entry, changed.entry_type)?;
- self.write_column_seperator()?;
+ self.write_column_separator()?;
self.write_uid(entry, changed.uid)?;
- self.write_column_seperator()?;
+ self.write_column_separator()?;
self.write_gid(entry, changed.gid)?;
- self.write_column_seperator()?;
+ self.write_column_separator()?;
self.write_mode(entry, changed.mode)?;
- self.write_column_seperator()?;
+ self.write_column_separator()?;
self.write_filesize(entry, changed.size)?;
- self.write_column_seperator()?;
+ self.write_column_separator()?;
self.write_mtime(entry, changed.mtime)?;
- self.write_column_seperator()?;
+ self.write_column_separator()?;
self.write_file_name(entry, changed.content)?;
writeln!(self.stream)?;
diff --git a/src/traffic_control_cache.rs b/src/traffic_control_cache.rs
index 4c3bccee..32da6f4c 100644
--- a/src/traffic_control_cache.rs
+++ b/src/traffic_control_cache.rs
@@ -92,7 +92,7 @@ fn network_match_len(networks: &[IpInet], ip: &IpAddr) -> Option<u8> {
match_len
}
-fn cannonical_ip(ip: IpAddr) -> IpAddr {
+fn canonical_ip(ip: IpAddr) -> IpAddr {
// TODO: use std::net::IpAddr::to_cananical once stable
match ip {
IpAddr::V4(addr) => IpAddr::V4(addr),
@@ -332,7 +332,7 @@ impl TrafficControlCache {
peer: SocketAddr,
now: i64,
) -> (&str, Option<SharedRateLimit>, Option<SharedRateLimit>) {
- let peer_ip = cannonical_ip(peer.ip());
+ let peer_ip = canonical_ip(peer.ip());
log::debug!("lookup_rate_limiter: {:?}", peer_ip);
diff --git a/www/NavigationTree.js b/www/NavigationTree.js
index a5ea390f..53c8daff 100644
--- a/www/NavigationTree.js
+++ b/www/NavigationTree.js
@@ -272,8 +272,8 @@ Ext.define('PBS.view.main.NavigationTree', {
if (maintenance) {
const [type, message] = PBS.Utils.parseMaintenanceMode(maintenance);
qtip = `${type}${message ? ': ' + message : ''}`;
- let mainenanceTypeCls = type === 'delete' ? 'destroying' : 'maintenance';
- iconCls = `fa fa-database pmx-tree-icon-custom ${mainenanceTypeCls}`;
+ let maintenanceTypeCls = type === 'delete' ? 'destroying' : 'maintenance';
+ iconCls = `fa fa-database pmx-tree-icon-custom ${maintenanceTypeCls}`;
}
if (getChildTextAt(j).localeCompare(name) !== 0) {
diff --git a/www/config/PruneAndGC.js b/www/config/PruneAndGC.js
index b85c2961..ab92c8fe 100644
--- a/www/config/PruneAndGC.js
+++ b/www/config/PruneAndGC.js
@@ -53,8 +53,8 @@ Ext.define('PBS.config.PruneAndGC', {
}
},
- cbindData: function(initalConfig) {
+ cbindData: function(initialConfig) {
let me = this;
- me.datastore = initalConfig.datastore ? initalConfig.datastore : undefined;
+ me.datastore = initialConfig.datastore ? initialConfig.datastore : undefined;
},
});
diff --git a/www/datastore/Notes.js b/www/datastore/Notes.js
index 2928b7ec..b9914728 100644
--- a/www/datastore/Notes.js
+++ b/www/datastore/Notes.js
@@ -9,7 +9,7 @@ Ext.define('PBS.DataStoreNotes', {
scrollable: true,
animCollapse: false,
- cbindData: function(initalConfig) {
+ cbindData: function(initialConfig) {
let me = this;
me.url = `/api2/extjs/config/datastore/${me.datastore}`;
return { };
diff --git a/www/datastore/Panel.js b/www/datastore/Panel.js
index 0ee38a1b..ad9fc10f 100644
--- a/www/datastore/Panel.js
+++ b/www/datastore/Panel.js
@@ -3,7 +3,7 @@ Ext.define('PBS.DataStorePanel', {
alias: 'widget.pbsDataStorePanel',
mixins: ['Proxmox.Mixin.CBind'],
- cbindData: function(initalConfig) {
+ cbindData: function(initialConfig) {
let me = this;
return {
aclPath: `/datastore/${me.datastore}`,
diff --git a/www/window/NotificationMatcherOverride.js b/www/window/NotificationMatcherOverride.js
index 8636653c..bc7b7c1d 100644
--- a/www/window/NotificationMatcherOverride.js
+++ b/www/window/NotificationMatcherOverride.js
@@ -168,7 +168,7 @@ Ext.define('PBS.panel.NotificationRulesEditPanel', {
onGetValues: function(values) {
let me = this;
- let deleteArrayIfEmtpy = (field) => {
+ let deleteArrayIfEmpty = (field) => {
if (Ext.isArray(values[field])) {
if (values[field].length === 0) {
delete values[field];
@@ -178,9 +178,9 @@ Ext.define('PBS.panel.NotificationRulesEditPanel', {
}
}
};
- deleteArrayIfEmtpy('match-field');
- deleteArrayIfEmtpy('match-severity');
- deleteArrayIfEmtpy('match-calendar');
+ deleteArrayIfEmpty('match-field');
+ deleteArrayIfEmpty('match-severity');
+ deleteArrayIfEmpty('match-calendar');
return values;
},
--
2.39.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [pbs-devel] [PATCH backup 2/5] fix typos in rust documentation blocks
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 2/5] fix typos in rust documentation blocks Maximiliano Sandoval
@ 2024-08-07 10:49 ` Gabriel Goller
2024-08-07 12:09 ` Maximiliano Sandoval
0 siblings, 1 reply; 10+ messages in thread
From: Gabriel Goller @ 2024-08-07 10:49 UTC (permalink / raw)
To: Proxmox Backup Server development discussion
On 07.08.2024 12:32, Maximiliano Sandoval wrote:
>Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
>---
> pbs-api-types/src/acl.rs | 2 +-
> pbs-client/src/pxar/create.rs | 2 +-
> pbs-config/src/cached_user_info.rs | 2 +-
> pbs-tools/src/lib.rs | 2 +-
> proxmox-backup-client/src/benchmark.rs | 2 +-
> proxmox-file-restore/src/block_driver.rs | 2 +-
> src/api2/backup/environment.rs | 2 +-
> src/api2/node/services.rs | 2 +-
> src/api2/reader/environment.rs | 2 +-
> src/tape/file_formats/mod.rs | 2 +-
> 10 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/pbs-api-types/src/acl.rs b/pbs-api-types/src/acl.rs
>index ef639862..e133247d 100644
>--- a/pbs-api-types/src/acl.rs
>+++ b/pbs-api-types/src/acl.rs
>@@ -223,7 +223,7 @@ pub enum Role {
> RemoteAudit = ROLE_REMOTE_AUDIT,
> /// Remote Administrator
> RemoteAdmin = ROLE_REMOTE_ADMIN,
>- /// Syncronisation Opertator
>+ /// Synchronization Opertator
s/Opertator/Operator/
> RemoteSyncOperator = ROLE_REMOTE_SYNC_OPERATOR,
> /// Tape Auditor
> TapeAudit = ROLE_TAPE_AUDIT,
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [pbs-devel] [PATCH backup 4/5] fix typos in strings
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 4/5] fix typos in strings Maximiliano Sandoval
@ 2024-08-07 10:52 ` Lukas Wagner
2024-08-07 14:48 ` Thomas Lamprecht
0 siblings, 1 reply; 10+ messages in thread
From: Lukas Wagner @ 2024-08-07 10:52 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Maximiliano Sandoval
On 2024-08-07 12:32, Maximiliano Sandoval wrote:
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
> ---
> docs/lto-barcode/page-calibration.js | 8 ++++----
> pbs-api-types/src/ldap.rs | 2 +-
> src/api2/node/tasks.rs | 2 +-
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/docs/lto-barcode/page-calibration.js b/docs/lto-barcode/page-calibration.js
> index 3c7fed82..54512a9f 100644
> --- a/docs/lto-barcode/page-calibration.js
> +++ b/docs/lto-barcode/page-calibration.js
> @@ -108,7 +108,7 @@ Ext.define('PageCalibration', {
> xtype: 'numberfield',
> value: 'a4',
> name: 's_x',
> - fieldLabel: 'Meassured Start Offset Sx (mm)',
> + fieldLabel: 'Measured Start Offset Sx (mm)',
I wonder, shouldn't these use gettext?
> allowBlank: false,
> labelWidth: 200,
> },
> @@ -116,7 +116,7 @@ Ext.define('PageCalibration', {
> xtype: 'numberfield',
> value: 'a4',
> name: 'd_x',
> - fieldLabel: 'Meassured Length Dx (mm)',
> + fieldLabel: 'Measured Length Dx (mm)',
> allowBlank: false,
> labelWidth: 200,
> },
> @@ -124,7 +124,7 @@ Ext.define('PageCalibration', {
> xtype: 'numberfield',
> value: 'a4',
> name: 's_y',
> - fieldLabel: 'Meassured Start Offset Sy (mm)',
> + fieldLabel: 'Measured Start Offset Sy (mm)',
> allowBlank: false,
> labelWidth: 200,
> },
> @@ -132,7 +132,7 @@ Ext.define('PageCalibration', {
> xtype: 'numberfield',
> value: 'a4',
> name: 'd_y',
> - fieldLabel: 'Meassured Length Dy (mm)',
> + fieldLabel: 'Measured Length Dy (mm)',
> allowBlank: false,
> labelWidth: 200,
> },
> diff --git a/pbs-api-types/src/ldap.rs b/pbs-api-types/src/ldap.rs
> index f3df90a0..a3e0407b 100644
> --- a/pbs-api-types/src/ldap.rs
> +++ b/pbs-api-types/src/ldap.rs
> @@ -149,7 +149,7 @@ pub const SYNC_DEFAULTS_STRING_SCHEMA: Schema = StringSchema::new("sync defaults
> .schema();
>
> const REMOVE_VANISHED_DESCRIPTION: &str =
> - "A semicolon-seperated list of things to remove when they or the user \
> + "A semicolon-separated list of things to remove when they or the user \
> vanishes during user synchronization. The following values are possible: ``entry`` removes the \
> user when not returned from the sync; ``properties`` removes any \
> properties on existing user that do not appear in the source. \
> diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs
> index 8f08d3af..069613ad 100644
> --- a/src/api2/node/tasks.rs
> +++ b/src/api2/node/tasks.rs
> @@ -252,7 +252,7 @@ fn into_task_list_item(info: proxmox_rest_server::TaskListInfo) -> pbs_api_types
> exitstatus: {
> type: String,
> optional: true,
> - description: "'OK', 'Error: <msg>', or 'unkwown'.",
> + description: "'OK', 'Error: <msg>', or 'unknown'.",
> },
> },
> },
--
- Lukas
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [pbs-devel] [PATCH backup 2/5] fix typos in rust documentation blocks
2024-08-07 10:49 ` Gabriel Goller
@ 2024-08-07 12:09 ` Maximiliano Sandoval
0 siblings, 0 replies; 10+ messages in thread
From: Maximiliano Sandoval @ 2024-08-07 12:09 UTC (permalink / raw)
To: Gabriel Goller; +Cc: Proxmox Backup Server development discussion
Thanks, will send v2.
Gabriel Goller <g.goller@proxmox.com> writes:
> On 07.08.2024 12:32, Maximiliano Sandoval wrote:
>>Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
>>---
>> pbs-api-types/src/acl.rs | 2 +-
>> pbs-client/src/pxar/create.rs | 2 +-
>> pbs-config/src/cached_user_info.rs | 2 +-
>> pbs-tools/src/lib.rs | 2 +-
>> proxmox-backup-client/src/benchmark.rs | 2 +-
>> proxmox-file-restore/src/block_driver.rs | 2 +-
>> src/api2/backup/environment.rs | 2 +-
>> src/api2/node/services.rs | 2 +-
>> src/api2/reader/environment.rs | 2 +-
>> src/tape/file_formats/mod.rs | 2 +-
>> 10 files changed, 10 insertions(+), 10 deletions(-)
>>
>>diff --git a/pbs-api-types/src/acl.rs b/pbs-api-types/src/acl.rs
>>index ef639862..e133247d 100644
>>--- a/pbs-api-types/src/acl.rs
>>+++ b/pbs-api-types/src/acl.rs
>>@@ -223,7 +223,7 @@ pub enum Role {
>> RemoteAudit = ROLE_REMOTE_AUDIT,
>> /// Remote Administrator
>> RemoteAdmin = ROLE_REMOTE_ADMIN,
>>- /// Syncronisation Opertator
>>+ /// Synchronization Opertator
>
> s/Opertator/Operator/
>
>> RemoteSyncOperator = ROLE_REMOTE_SYNC_OPERATOR,
>> /// Tape Auditor
>> TapeAudit = ROLE_TAPE_AUDIT,
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
--
Maximiliano
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [pbs-devel] [PATCH backup 4/5] fix typos in strings
2024-08-07 10:52 ` Lukas Wagner
@ 2024-08-07 14:48 ` Thomas Lamprecht
2024-08-09 11:17 ` Lukas Wagner
0 siblings, 1 reply; 10+ messages in thread
From: Thomas Lamprecht @ 2024-08-07 14:48 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Lukas Wagner,
Maximiliano Sandoval
On 07/08/2024 12:52, Lukas Wagner wrote:
> On 2024-08-07 12:32, Maximiliano Sandoval wrote:
>> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
>> ---
>> docs/lto-barcode/page-calibration.js | 8 ++++----
>> pbs-api-types/src/ldap.rs | 2 +-
>> src/api2/node/tasks.rs | 2 +-
>> 3 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/docs/lto-barcode/page-calibration.js b/docs/lto-barcode/page-calibration.js
>> index 3c7fed82..54512a9f 100644
>> --- a/docs/lto-barcode/page-calibration.js
>> +++ b/docs/lto-barcode/page-calibration.js
>> @@ -108,7 +108,7 @@ Ext.define('PageCalibration', {
>> xtype: 'numberfield',
>> value: 'a4',
>> name: 's_x',
>> - fieldLabel: 'Meassured Start Offset Sx (mm)',
>> + fieldLabel: 'Measured Start Offset Sx (mm)',
>
> I wonder, shouldn't these use gettext?
>
The LTO barcode label tool [0] has no gettext infra and is currently also not
considered when extracting texts for the i18n repo. In that small app the
gettext function is defined as identity function [1] just to avoid that the
widget-toolkit breaks.
While we could naturally add i18n support, the LTO barcode label app is a
1) rather niche tool and 2) not really complex, so it might be a bit overkill,
at least without users requesting i18n support there.
[0]: https://pbs.proxmox.com/docs/lto-barcode/index.html
[1]: https://git.proxmox.com/?p=proxmox-backup.git;a=blob;f=docs/lto-barcode/lto-barcode.js;h=2aeaba1b6084c5baf178a8cf5445e6c728dae719;hb=ab8e84498d9cba8be280ebbeb2ffe9daf6cc439a#l1
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [pbs-devel] [PATCH backup 4/5] fix typos in strings
2024-08-07 14:48 ` Thomas Lamprecht
@ 2024-08-09 11:17 ` Lukas Wagner
0 siblings, 0 replies; 10+ messages in thread
From: Lukas Wagner @ 2024-08-09 11:17 UTC (permalink / raw)
To: Thomas Lamprecht, Proxmox Backup Server development discussion,
Maximiliano Sandoval
On 2024-08-07 16:48, Thomas Lamprecht wrote:
> On 07/08/2024 12:52, Lukas Wagner wrote:
>> On 2024-08-07 12:32, Maximiliano Sandoval wrote:
>>> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
>>> ---
>>> docs/lto-barcode/page-calibration.js | 8 ++++----
>>> pbs-api-types/src/ldap.rs | 2 +-
>>> src/api2/node/tasks.rs | 2 +-
>>> 3 files changed, 6 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/docs/lto-barcode/page-calibration.js b/docs/lto-barcode/page-calibration.js
>>> index 3c7fed82..54512a9f 100644
>>> --- a/docs/lto-barcode/page-calibration.js
>>> +++ b/docs/lto-barcode/page-calibration.js
>>> @@ -108,7 +108,7 @@ Ext.define('PageCalibration', {
>>> xtype: 'numberfield',
>>> value: 'a4',
>>> name: 's_x',
>>> - fieldLabel: 'Meassured Start Offset Sx (mm)',
>>> + fieldLabel: 'Measured Start Offset Sx (mm)',
>>
>> I wonder, shouldn't these use gettext?
>>
>
> The LTO barcode label tool [0] has no gettext infra and is currently also not
> considered when extracting texts for the i18n repo. In that small app the
> gettext function is defined as identity function [1] just to avoid that the
> widget-toolkit breaks.
>
> While we could naturally add i18n support, the LTO barcode label app is a
> 1) rather niche tool and 2) not really complex, so it might be a bit overkill,
> at least without users requesting i18n support there.
Ah right, thx for the explanation!
--
- Lukas
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-08-09 11:17 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-07 10:32 [pbs-devel] [PATCH backup 1/5] fix typos in comments Maximiliano Sandoval
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 2/5] fix typos in rust documentation blocks Maximiliano Sandoval
2024-08-07 10:49 ` Gabriel Goller
2024-08-07 12:09 ` Maximiliano Sandoval
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 3/5] fix typos in docs an manual pages Maximiliano Sandoval
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 4/5] fix typos in strings Maximiliano Sandoval
2024-08-07 10:52 ` Lukas Wagner
2024-08-07 14:48 ` Thomas Lamprecht
2024-08-09 11:17 ` Lukas Wagner
2024-08-07 10:32 ` [pbs-devel] [PATCH backup 5/5] fix typos in variables and function names Maximiliano Sandoval
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox