[checkmk-commits] Some minor code formating

Module: check_mk Branch: master Commit: adfc9a2a382d96ba8bd76e09c38055e2112dacf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adfc9a2a382d96… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 6 10:58:55 2017 +0200 Some minor code formating Change-Id: Ie15da1b89a5169bc61f3aab43d180a26fceb4b35 --- .bugs/2513 | 7 +++++-- bin/mkbackup | 5 +---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bugs/2513 b/.bugs/2513 index 13a06dc..e89b0ab 100644 --- a/.bugs/2513 +++ b/.bugs/2513 @@ -1,8 +1,11 @@ Title: faulty reference to php5 in debian 9 and nagvis Component: multisite -State: open +Class: bug +State: done Date: 2017-08-17 14:45:04 Targetversion: 1.2.8 -Class: bug php5-cgi reference is not available in Debian 9. It's just php-cgi or php7-cgi. + +2017-09-06 08:39:27: changed state open -> done +Has already been fixed. diff --git a/bin/mkbackup b/bin/mkbackup index 9513594..c33b562 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -167,7 +167,6 @@ def site_config_path(): def acquire_backup_lock(): global g_backup_lock_f lock_file_path = "/tmp/mkbackup.lock" - if not os.path.exists(lock_file_path): try: g_backup_lock_f = tempfile.NamedTemporaryFile(mode="a+", dir="/tmp", delete=False) @@ -190,6 +189,7 @@ def acquire_backup_lock(): cloexec_flag = fcntl.FD_CLOEXEC except AttributeError: cloexec_flag = 1 + fd = g_backup_lock_f.fileno() fcntl.fcntl(fd, fcntl.F_SETFD, fcntl.fcntl(fd, fcntl.F_GETFD) | cloexec_flag) @@ -672,7 +672,6 @@ def do_site_backup(opts, site=None, try_stop=True): raise MKGeneralException("Failed to backup site that only supports " "offline backup.") - raise MKGeneralException("Site backup failed: %s" % err) @@ -749,9 +748,7 @@ class MKBackupStream(object): while True: chunk, finished = self._read_chunk() - self._bytes_copied += len(chunk) - yield self._process_chunk(chunk) if finished and not self._is_alive():