all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: [pve-devel] applied:  [PATCH storage v4 2/2] fix whitespaces
Date: Fri, 04 Aug 2023 13:49:33 +0200	[thread overview]
Message-ID: <1691149760.zd32sfpraa.astroid@yuna.none> (raw)
In-Reply-To: <20230801144604.760331-3-p.hufnagl@proxmox.com>

again, limited to the non-alignmnet changes

On August 1, 2023 4:46 pm, Philipp Hufnagl wrote:
> Signed-off-by: Philipp Hufnagl <p.hufnagl@proxmox.com>
> ---
>  src/PVE/Storage/Plugin.pm | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> 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) = @_;
>  
>      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) = @_;
>  
>      if ($key eq 'nodes') {
> -        return join(',', keys(%$value));
> +	return join(',', keys(%$value));
>      } elsif ($key eq 'content') {
>  	my $res = content_hash_to_string($value) || 'none';
>  	return $res;
> @@ -1153,9 +1153,9 @@ sub volume_has_feature {
>  
>      my $key = undef;
>      if($snapname){
> -        $key = 'snap';
> +	$key = 'snap';
>      }else{
> -        $key =  $isBase ? 'base' : 'current';
> +	$key =  $isBase ? 'base' : 'current';
>      }
>  
>      return 1 if defined($features->{$feature}->{$key}->{$format});
> @@ -1199,14 +1199,14 @@ sub list_images {
>  	    next if !$found;
>  	}
>  
> -        my $info = {
> +	my $info = {
>  	    volid => $volid, format => $format,
>  	    size => $size, vmid => $owner, used => $used, parent => $parent
>  	};
>  
> -        $info->{ctime} = $ctime if $ctime;
> +	$info->{ctime} = $ctime if $ctime;
>  
> -        push @$res, $info;
> +	push @$res, $info;
>      }
>  
>      return $res;
> @@ -1580,7 +1580,7 @@ sub volume_export {
>  		run_command(['dd', "if=$file", "bs=4k"], output => '>&'.fileno($fh));
>  	    } else {
>  		run_command(['qemu-img', 'convert', '-f', $file_format, '-O', 'raw', $file, '/dev/stdout'],
> -		            output => '>&'.fileno($fh));
> +			    output => '>&'.fileno($fh));
>  	    }
>  	    return;
>  	} elsif ($format =~ /^(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 => '>&'.fileno($fh));
> +			output => '>&'.fileno($fh));
>  	    return;
>  	}
>      }
> @@ -1662,10 +1662,10 @@ sub volume_import {
>  	    or die "internal error: failed to get path to newly allocated volume $volname\n";
>  	if ($data_format eq 'raw' || $data_format eq 'qcow2' || $data_format eq 'vmdk') {
>  	    run_command(['dd', "of=$file", 'conv=sparse', 'bs=64k'],
> -	                input => '<&'.fileno($fh));
> +			input => '<&'.fileno($fh));
>  	} elsif ($data_format eq 'tar') {
>  	    run_command(['tar', @COMMON_TAR_FLAGS, '-C', $file, '-xf', '-'],
> -	                input => '<&'.fileno($fh));
> +			input => '<&'.fileno($fh));
>  	} else {
>  	    die "volume import format '$format' not available for $class";
>  	}
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
> 




  reply	other threads:[~2023-08-04 11:49 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-01 14:45 [pve-devel] [PATCH storage/manager/common v4 0/6] fix #4849: allow download of compressed ISOs Philipp Hufnagl
2023-08-01 14:45 ` [pve-devel] [PATCH storage v4 1/2] fix #4849: download-url: allow download and decompression " Philipp Hufnagl
2023-08-04 11:51   ` Fabian Grünbichler
2023-08-01 14:46 ` [pve-devel] [PATCH storage v4 2/2] fix whitespaces Philipp Hufnagl
2023-08-04 11:49   ` Fabian Grünbichler [this message]
2023-08-01 14:46 ` [pve-devel] [PATCH common v4 1/2] fix #4849: download file from url: add opt parameter for a decompression command Philipp Hufnagl
2023-08-04 11:47   ` [pve-devel] applied: " Fabian Grünbichler
2023-08-01 14:46 ` [pve-devel] [PATCH common v4 2/2] fix whitespaces Philipp Hufnagl
2023-08-04 11:48   ` [pve-devel] applied: " Fabian Grünbichler
2023-08-01 14:46 ` [pve-devel] [PATCH manager v4 1/2] fix #4849: download to storage: automatically dectect and configure compression Philipp Hufnagl
2023-08-04 11:53   ` Fabian Grünbichler
2023-08-01 14:46 ` [pve-devel] [PATCH manager v4 2/2] fix whitespaces Philipp Hufnagl
2023-08-04 11:49   ` [pve-devel] applied: " Fabian Grünbichler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1691149760.zd32sfpraa.astroid@yuna.none \
    --to=f.gruenbichler@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal