Gentoo Archives: gentoo-portage-dev

From: Aaron Bauman <bman@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Aaron Bauman <bman@g.o>
Subject: [gentoo-portage-dev] [PATCH 26/68] lib/portage/locks.py: fix whitespace
Date: Mon, 03 Aug 2020 22:45:05
Message-Id: 20200803224327.1593726-26-bman@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 01/68] lib/portage/util/_dyn_libs/PreservedLibsRegistry.py: fix whitespace by Aaron Bauman
1 Signed-off-by: Aaron Bauman <bman@g.o>
2 ---
3 lib/portage/locks.py | 6 +++---
4 1 file changed, 3 insertions(+), 3 deletions(-)
5
6 diff --git a/lib/portage/locks.py b/lib/portage/locks.py
7 index a0981712e..5fa6d5d38 100644
8 --- a/lib/portage/locks.py
9 +++ b/lib/portage/locks.py
10 @@ -444,7 +444,7 @@ def unlockfile(mytuple):
11 if(myfd == HARDLINK_FD):
12 unhardlink_lockfile(lockfilename, unlinkfile=unlinkfile)
13 return True
14 -
15 +
16 # myfd may be None here due to myfd = mypath in lockfile()
17 if isinstance(lockfilename, str) and \
18 not os.path.exists(lockfilename):
19 @@ -672,7 +672,7 @@ def hardlock_cleanup(path, remove_all_locks=False):
20 hostpid = parts[1].split("-")
21 host = "-".join(hostpid[:-1])
22 pid = hostpid[-1]
23 -
24 +
25 if filename not in mylist:
26 mylist[filename] = {}
27 if host not in mylist[filename]:
28 @@ -683,7 +683,7 @@ def hardlock_cleanup(path, remove_all_locks=False):
29
30
31 results.append(_("Found %(count)s locks") % {"count": mycount})
32 -
33 +
34 for x in mylist:
35 if myhost in mylist[x] or remove_all_locks:
36 mylockname = hardlock_name(path + "/" + x)
37 --
38 2.28.0