commit: 9bb9212679f88ca2f9a87650d98c3141f837e2c5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 20:50:00 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 15:55:57 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9bb92126
catalyst: Replace pathcompare()
Modern Python allows us to do this in a much cleaner way.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/support.py | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/catalyst/support.py b/catalyst/support.py
index f49315a5..4458ed20 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -5,6 +5,7 @@ import os
import re
import shutil
import time
+from pathlib import Path
from subprocess import Popen
from catalyst import log
@@ -179,31 +180,20 @@ def read_makeconf(mymakeconffile):
return makeconf
-def pathcompare(path1, path2):
- # Change double slashes to slash
- path1 = re.sub(r"//", r"/", path1)
- path2 = re.sub(r"//", r"/", path2)
- # Removing ending slash
- path1 = re.sub("/$", "", path1)
- path2 = re.sub("/$", "", path2)
-
- if path1 == path2:
- return 1
- return 0
-
-
def ismount(path):
"""Like os.path.ismount, but also support bind mounts"""
if os.path.ismount(path):
- return 1
+ return True
+
a = os.popen("mount")
mylines = a.readlines()
a.close()
for line in mylines:
mysplit = line.split()
- if pathcompare(path, mysplit[2]):
- return 1
- return 0
+ if Path(path) == Path(mysplit[2]):
+ return True
+
+ return False
def addl_arg_parse(myspec, addlargs, requiredspec, validspec):
