From ed5ef6458cb0208b6d6eb79ffed9c062b29210e4 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Apr 24 2018 21:20:37 +0000 Subject: [PATCH 1/2] Fix typo in deleted mount check Follow up to PR #402 Fixes #387 --- diff --git a/koji/tasks.py b/koji/tasks.py index 6d5a000..a8fa9ff 100644 --- a/koji/tasks.py +++ b/koji/tasks.py @@ -42,8 +42,8 @@ def scan_mounts(topdir): for line in fo.readlines(): path = line.split()[1] if path.startswith(topdir): - if path.endswith('\040(deleted)'): - path = path[:-10] + if path.endswith(r'\040(deleted)'): + path = path[:-13] logger.warning('Found deleted mountpoint: %s' % path) mplist.append(path) fo.close() From b0ee84f062a8c51a0a98d5419e388d94c89c3ae4 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Apr 24 2018 21:20:37 +0000 Subject: [PATCH 2/2] fix unit test deleted mounts data --- diff --git a/tests/test_lib_py2only/test_tasks.py b/tests/test_lib_py2only/test_tasks.py index 7b2d0f2..18cf398 100644 --- a/tests/test_lib_py2only/test_tasks.py +++ b/tests/test_lib_py2only/test_tasks.py @@ -21,7 +21,7 @@ def get_fake_mounts_file(): 'proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0\n' 'devtmpfs /dev devtmpfs rw,seclabel,nosuid,size=238836k,nr_inodes=59709,mode=755 0 0\n' 'securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0\n' - 'tmpfs /dev/shm\040(deleted) tmpfs rw,seclabel,nosuid,nodev 0 0\n' + 'tmpfs /dev/shm\\040(deleted) tmpfs rw,seclabel,nosuid,nodev 0 0\n' 'devpts /dev/pts devpts rw,seclabel,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0\n' 'tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0\n' 'tmpfs /sys/fs/cgroup tmpfs ro,seclabel,nosuid,nodev,noexec,mode=755 0 0\n'