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 3F4DF72F4C for ; Thu, 17 Jun 2021 11:14:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3CE9819A39 for ; Thu, 17 Jun 2021 11:14:08 +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 id 8278D19A2E for ; Thu, 17 Jun 2021 11:14:07 +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 5926244194 for ; Thu, 17 Jun 2021 11:14:07 +0200 (CEST) Date: Thu, 17 Jun 2021 11:14:00 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20210617085826.136788-1-f.ebner@proxmox.com> <20210617085826.136788-2-f.ebner@proxmox.com> In-Reply-To: <20210617085826.136788-2-f.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1623921227.q6yt88zydn.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 1 AWL -1.708 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_SOMETLD_ARE_BAD_TLD 5 .stream, .trade, .pw, .top, .press, .guru, .casa & .date TLD Abuse SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] applied: [PATCH storage 2/2] postinst: remove old file if new one is identical 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: Thu, 17 Jun 2021 09:14:08 -0000 On June 17, 2021 10:58 am, Fabian Ebner wrote: > Suggested-by: Thomas Lamprecht > Signed-off-by: Fabian Ebner > --- > debian/postinst | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) >=20 > diff --git a/debian/postinst b/debian/postinst > index 963ad06..9dbb3b9 100644 > --- a/debian/postinst > +++ b/debian/postinst > @@ -18,7 +18,12 @@ case "$1" in > base=3D$(basename --suffix=3D".cred" "$file") > target=3D"/etc/pve/priv/storage/$base.pw" > if [ -f "$target" ]; then > - echo "Warning: not renaming $file, because $targ= et already exists!" >&2 > + if diff "$file" "$target" >&2 > /dev/null; then > + echo "Info: removing $file, because it is id= entical to $target" >&2 > + rm "$file" || { echo "$warning" && continue;= } > + else > + echo "Warning: not renaming $file, because $= target already exists and differs!" >&2 > + fi > else > echo "Info: renaming $file to $target" >&2 > mv "$file" "$target" || { echo "$warning" && con= tinue; } > --=20 > 2.30.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