Skip to content

H
Hdlmake
Commit 54608e84 authored by Pawel Szostek's avatar Pawel Szostek
Browse files
Options

change OS-dependent parts to use portable code

parent ba564b0f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
src/module.py
View file @ 54608e84
......@@ -155,13 +155,10 @@ class Module(object):
logging.debug("Removing " + self.path)
shutil.rmtree(self.path)
parts = self.path.split('/')
while True:
try:
parts = parts[:-1]
tmp = '/'.join(parts)
logging.debug("Trying to remove " + tmp)
os.rmdir(tmp)
logging.debug("Trying to remove " + os.path.dirname(self.path))
os.rmdir(os.path.dirname(self.path))
except OSError: # a catologue is not empty - we are done
break
......
src/util/path.py
View file @ 54608e84
......@@ -55,11 +55,12 @@ def url_basename(url):
"""
if url.endswith(".git"):
ret = os.path.basename(url[:-4])
parts = url[:-4].split("/")
elif url[-1] == '/':
ret = os.path.basename(url[:-1])
parts = url[:-1].split("/")
else:
ret = os.path.basename(url)
parts = url.split("/")
ret = parts[-1]
return ret
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment