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 DF2CC9AEE for ; Fri, 4 Aug 2023 13:49:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C77BAE379 for ; Fri, 4 Aug 2023 13:49:41 +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 for ; Fri, 4 Aug 2023 13:49:41 +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 E774D40BE1 for ; Fri, 4 Aug 2023 13:49:40 +0200 (CEST) Date: Fri, 04 Aug 2023 13:49:33 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20230801144604.760331-1-p.hufnagl@proxmox.com> <20230801144604.760331-3-p.hufnagl@proxmox.com> In-Reply-To: <20230801144604.760331-3-p.hufnagl@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1691149760.zd32sfpraa.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] applied: [PATCH storage v4 2/2] fix whitespaces X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Aug 2023 11:49:41 -0000 again, limited to the non-alignmnet changes On August 1, 2023 4:46 pm, Philipp Hufnagl wrote: > Signed-off-by: Philipp Hufnagl > --- > src/PVE/Storage/Plugin.pm | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) >=20 > diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm > index 18cb5d5..1795ae3 100644 > --- a/src/PVE/Storage/Plugin.pm > +++ b/src/PVE/Storage/Plugin.pm > @@ -264,7 +264,7 @@ sub verify_server { > my ($server, $noerr) =3D @_; > =20 > if (!(PVE::JSONSchema::pve_verify_ip($server, 1) || > - PVE::JSONSchema::pve_verify_dns_name($server, 1))) > + PVE::JSONSchema::pve_verify_dns_name($server, 1))) > { > return undef if $noerr; > die "value does not look like a valid server name or IP address\n"; > @@ -472,7 +472,7 @@ sub encode_value { > my ($class, $type, $key, $value) =3D @_; > =20 > if ($key eq 'nodes') { > - return join(',', keys(%$value)); > + return join(',', keys(%$value)); > } elsif ($key eq 'content') { > my $res =3D content_hash_to_string($value) || 'none'; > return $res; > @@ -1153,9 +1153,9 @@ sub volume_has_feature { > =20 > my $key =3D undef; > if($snapname){ > - $key =3D 'snap'; > + $key =3D 'snap'; > }else{ > - $key =3D $isBase ? 'base' : 'current'; > + $key =3D $isBase ? 'base' : 'current'; > } > =20 > return 1 if defined($features->{$feature}->{$key}->{$format}); > @@ -1199,14 +1199,14 @@ sub list_images { > next if !$found; > } > =20 > - my $info =3D { > + my $info =3D { > volid =3D> $volid, format =3D> $format, > size =3D> $size, vmid =3D> $owner, used =3D> $used, parent =3D> $pa= rent > }; > =20 > - $info->{ctime} =3D $ctime if $ctime; > + $info->{ctime} =3D $ctime if $ctime; > =20 > - push @$res, $info; > + push @$res, $info; > } > =20 > return $res; > @@ -1580,7 +1580,7 @@ sub volume_export { > run_command(['dd', "if=3D$file", "bs=3D4k"], output =3D> '>&'.fileno($= fh)); > } else { > run_command(['qemu-img', 'convert', '-f', $file_format, '-O', 'raw', $= file, '/dev/stdout'], > - output =3D> '>&'.fileno($fh)); > + output =3D> '>&'.fileno($fh)); > } > return; > } elsif ($format =3D~ /^(qcow2|vmdk)\+size$/) { > @@ -1593,7 +1593,7 @@ sub volume_export { > goto unsupported if $file_format ne 'subvol'; > write_common_header($fh, $size); > run_command(['tar', @COMMON_TAR_FLAGS, '-cf', '-', '-C', $file, '.'= ], > - output =3D> '>&'.fileno($fh)); > + output =3D> '>&'.fileno($fh)); > return; > } > } > @@ -1662,10 +1662,10 @@ sub volume_import { > or die "internal error: failed to get path to newly allocated volum= e $volname\n"; > if ($data_format eq 'raw' || $data_format eq 'qcow2' || $data_format eq= 'vmdk') { > run_command(['dd', "of=3D$file", 'conv=3Dsparse', 'bs=3D64k'], > - input =3D> '<&'.fileno($fh)); > + input =3D> '<&'.fileno($fh)); > } elsif ($data_format eq 'tar') { > run_command(['tar', @COMMON_TAR_FLAGS, '-C', $file, '-xf', '-'], > - input =3D> '<&'.fileno($fh)); > + input =3D> '<&'.fileno($fh)); > } else { > die "volume import format '$format' not available for $class"; > } > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20