From ae200950d4be2aa00ba7635203fa18222f214487 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 13 Dec 2019 12:11:58 +0100 Subject: [PATCH] grammar fix: s/does not exists/does not exist/g bump versioned build-dependency, as qemu-server has tests checking for errors, and we fixed an grammar error in pve-storage, so we need the newer version to ensure our test go through Signed-off-by: Thomas Lamprecht --- PVE/API2/Qemu.pm | 2 +- PVE/QemuServer.pm | 2 +- debian/control | 2 +- test/run_qemu_img_convert_tests.pl | 2 +- test/test_get_replicatable_volumes.pl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 3c7ef30..cf9da16 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -206,7 +206,7 @@ my $create_disks = sub { my $size = PVE::Storage::volume_size_info($storecfg, $volid); - die "volume $volid does not exists\n" if !$size; + die "volume $volid does not exist\n" if !$size; $disk->{size} = $size; } diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 09a1559..f1da3e3 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -6306,7 +6306,7 @@ sub restore_vma_archive { my $conffile = PVE::QemuConfig->config_file($vmid); my $tmpfn = "$conffile.$$.tmp"; - # Note: $oldconf is undef if VM does not exists + # Note: $oldconf is undef if VM does not exist my $cfs_path = PVE::QemuConfig->cfs_config_path($vmid); my $oldconf = PVE::Cluster::cfs_read_file($cfs_path); diff --git a/debian/control b/debian/control index a754536..b848368 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 11~), libpve-cluster-perl, libpve-common-perl (>= 6.0-6), libpve-guest-common-perl (>= 2.0-20), - libpve-storage-perl, + libpve-storage-perl (>= 6.1-3), libtest-mockmodule-perl, libuuid-perl, libxml-libxml-perl, diff --git a/test/run_qemu_img_convert_tests.pl b/test/run_qemu_img_convert_tests.pl index bd5542f..7e25bd4 100755 --- a/test/run_qemu_img_convert_tests.pl +++ b/test/run_qemu_img_convert_tests.pl @@ -150,7 +150,7 @@ my $tests = [ { name => "notexistingstorage", parameters => [ "local-lvm:vm-$vmid-disk-0", "not-existing:$vmid/vm-$vmid-disk-0.raw", 1024*10, undef, 1 ], - expected => "storage 'not-existing' does not exists\n", + expected => "storage 'not-existing' does not exist\n", }, { name => "vmdkfile", diff --git a/test/test_get_replicatable_volumes.pl b/test/test_get_replicatable_volumes.pl index 5f69886..d90e4f8 100755 --- a/test/test_get_replicatable_volumes.pl +++ b/test/test_get_replicatable_volumes.pl @@ -49,7 +49,7 @@ my $expect; my $test_name = "test non existent storage"; eval { $volumes = PVE::QemuConfig->get_replicatable_volumes($storecfg, $vmid, $conf, 0, 0); }; -is($@, "storage 'non-existent-store' does not exists\n", $test_name); +is($@, "storage 'non-existent-store' does not exist\n", $test_name); $test_name = "test with disk from other VM (not owner)"; -- 2.39.2