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 122639B8D for ; Fri, 4 Aug 2023 13:48:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E6C0DE305 for ; Fri, 4 Aug 2023 13:48:17 +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:48:17 +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 1B7B640BDE for ; Fri, 4 Aug 2023 13:48:17 +0200 (CEST) Date: Fri, 04 Aug 2023 13:48:11 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20230801144604.760331-1-p.hufnagl@proxmox.com> <20230801144604.760331-5-p.hufnagl@proxmox.com> In-Reply-To: <20230801144604.760331-5-p.hufnagl@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1691149672.bvh128boy6.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 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 common 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:48:48 -0000 the indentation part, skipping the alignment hunks as discussed off-list. On August 1, 2023 4:46 pm, Philipp Hufnagl wrote: > Signed-off-by: Philipp Hufnagl > --- > src/PVE/Tools.pm | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) >=20 > diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm > index 159ec82..28e70f0 100644 > --- a/src/PVE/Tools.pm > +++ b/src/PVE/Tools.pm > @@ -92,23 +92,23 @@ our $EMAIL_USER_RE =3D qr/[\w\+\-\~]+(\.[\w\+\-\~]+)*= /; > our $EMAIL_RE =3D qr/$EMAIL_USER_RE@[a-zA-Z0-9\-]+(\.[a-zA-Z0-9\-]+)*/; > =20 > use constant {CLONE_NEWNS =3D> 0x00020000, > - CLONE_NEWUTS =3D> 0x04000000, > - CLONE_NEWIPC =3D> 0x08000000, > - CLONE_NEWUSER =3D> 0x10000000, > - CLONE_NEWPID =3D> 0x20000000, > - CLONE_NEWNET =3D> 0x40000000}; > + CLONE_NEWUTS =3D> 0x04000000, > + CLONE_NEWIPC =3D> 0x08000000, > + CLONE_NEWUSER =3D> 0x10000000, > + CLONE_NEWPID =3D> 0x20000000, > + CLONE_NEWNET =3D> 0x40000000}; > =20 > use constant {O_PATH =3D> 0x00200000, > - O_CLOEXEC =3D> 0x00080000, > - O_TMPFILE =3D> 0x00400000 | O_DIRECTORY}; > + O_CLOEXEC =3D> 0x00080000, > + O_TMPFILE =3D> 0x00400000 | O_DIRECTORY}; > =20 > use constant {AT_EMPTY_PATH =3D> 0x1000, > - AT_FDCWD =3D> -100}; > + AT_FDCWD =3D> -100}; > =20 > # from > use constant {RENAME_NOREPLACE =3D> (1 << 0), > - RENAME_EXCHANGE =3D> (1 << 1), > - RENAME_WHITEOUT =3D> (1 << 2)}; > + RENAME_EXCHANGE =3D> (1 << 1), > + RENAME_WHITEOUT =3D> (1 << 2)}; > =20 > sub run_with_timeout { > my ($timeout, $code, @param) =3D @_; > @@ -579,7 +579,7 @@ sub run_command { > } > } > =20 > - alarm(0); > + alarm(0); > }; > =20 > my $err =3D $@; > @@ -1354,7 +1354,7 @@ sub dump_journal { > my $parser =3D sub { > my $line =3D shift; > =20 > - return if $count++ < $start; > + return if $count++ < $start; > return if $limit <=3D 0; > push @$lines, { n =3D> int($count), t =3D> $line}; > $limit--; > @@ -1441,7 +1441,7 @@ sub unpack_sockaddr_in46 { > my ($sin) =3D @_; > my $family =3D Socket::sockaddr_family($sin); > my ($port, $host) =3D ($family =3D=3D AF_INET6 ? Socket::unpack_sock= addr_in6($sin) > - : Socket::unpack_sockaddr_i= n($sin)); > + : Socket::unpack_sockaddr_in($sin)); > return ($family, $port, $host); > } > =20 > @@ -1485,8 +1485,8 @@ sub get_fqdn { > sub parse_host_and_port { > my ($address) =3D @_; > if ($address =3D~ /^($IPV4RE|[[:alnum:]\-.]+)(?::(\d+))?$/ || = # ipv4 or host with optional ':port' > - $address =3D~ /^\[($IPV6RE|$IPV4RE|[[:alnum:]\-.]+)\](?::(\d+))?= $/ || # anything in brackets with optional ':port' > - $address =3D~ /^($IPV6RE)(?:\.(\d+))?$/) = # ipv6 with optional port separated by dot > + $address =3D~ /^\[($IPV6RE|$IPV4RE|[[:alnum:]\-.]+)\](?::(\d+))?$/ || #= anything in brackets with optional ':port' > + $address =3D~ /^($IPV6RE)(?:\.(\d+))?$/) #= ipv6 with optional port separated by dot > { > return ($1, $2, 1); # end with 1 to support simple if(parse...) tests > } > --=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