From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/3] unbound-dhcp-leases-bridge: Make comparison work if old file does not exist Date: Fri, 26 Apr 2024 15:09:19 +0000 Message-ID: <20240426150919.3766772-3-michael.tremer@ipfire.org> In-Reply-To: <20240426150919.3766772-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4802821318482372799==" List-Id: --===============4802821318482372799== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This patch catches any errors if the file did not previously exist and therefore skips the comparison. Signed-off-by: Michael Tremer --- config/unbound/unbound-dhcp-leases-bridge | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbou= nd-dhcp-leases-bridge index 80c8267e8..7f89f620a 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -535,17 +535,22 @@ class UnboundConfigWriter(object): f.flush() =20 # Compare if the new leases file has changed from the previous version - if filecmp.cmp(f.name, self.path, shallow=3DFalse): - log.debug("The generated leases file has not changed") + try: + if filecmp.cmp(f.name, self.path, shallow=3DFalse): + log.debug("The generated leases file has not changed") =20 - return False + return False + + # Remove the old file + os.unlink(self.path) + + # If the previous file did not exist, just keep falling through + except FileNotFoundError: + pass =20 # Make file readable for everyone os.fchmod(f.fileno(), stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH) =20 - # Remove the old file - os.unlink(self.path) - # Move the file to its destination os.link(f.name, self.path) =20 --=20 2.39.2 --===============4802821318482372799==--