[pve-devel] applied: [PATCH qemu-server] QemuMigrate : cleanup identation

Thomas Lamprecht t.lamprecht at proxmox.com
Wed Feb 20 07:35:25 CET 2019


On 2/20/19 1:25 AM, Alexandre Derumier wrote:
> ---
>  PVE/QemuMigrate.pm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
> index 07d57ed..d33b8ff 100644
> --- a/PVE/QemuMigrate.pm
> +++ b/PVE/QemuMigrate.pm
> @@ -579,10 +579,10 @@ sub phase2 {
>  	    $rport = int($1);
>  	    $ruri = "tcp:$raddr:$rport";
>  	}
> -        elsif ($line =~ m/^spice listens on port (\d+)$/) {
> +	elsif ($line =~ m/^spice listens on port (\d+)$/) {
>  	    $spice_port = int($1);
>  	}
> -        elsif ($line =~ m/^storage migration listens on nbd:(localhost|[\d\.]+|\[[\d\.:a-fA-F]+\]):(\d+):exportname=(\S+) volume:(\S+)$/) {
> + 	elsif ($line =~ m/^storage migration listens on nbd:(localhost|[\d\.]+|\[[\d\.:a-fA-F]+\]):(\d+):exportname=(\S+) volume:(\S+)$/) {
>  	    my $volid = $4;
>  	    my $nbd_uri = "nbd:$1:$2:exportname=$3";
>  	    my $targetdrive = $3;
> @@ -706,7 +706,7 @@ sub phase2 {
>  	my (undef, $proxyticket) = PVE::AccessControl::assemble_spice_ticket($authuser, $vmid, $self->{node});
>  
>  	my $filename = "/etc/pve/nodes/$self->{node}/pve-ssl.pem";
> -        my $subject =  PVE::AccessControl::read_x509_subject_spice($filename);
> + 	my $subject =  PVE::AccessControl::read_x509_subject_spice($filename);
>  
>  	$self->log('info', "spice client_migrate_info");
>  
> 

applied, although it did not fully fix the identation:

> Applying: QemuMigrate : cleanup identation
> .git/rebase-apply/patch:18: space before tab in indent.
>         elsif ($line =~ m/^storage migration listens on nbd:(localhost|[\d\.]+|\[[\d\.:a-fA-F]+\]):(\d+):exportname=(\S+) volume:(\S+)$/) {
> .git/rebase-apply/patch:27: space before tab in indent.
>         my $subject =  PVE::AccessControl::read_x509_subject_spice($filename);
> warning: 2 lines add whitespace errors.

I made a followup (there was another one of these in the file too).
Thanks!



More information about the pve-devel mailing list