Skip to content
Snippets Groups Projects
Commit 42b4ec49 authored by Paweł Szostek's avatar Paweł Szostek
Browse files

Fix bug in cleaning modules

There was a quasi-bug that caused that
hdlmake was trying to remove some submodules
after thier parent modules were removed. This
generated error messages. Now the modules are
removed in reverse order compared to fetching
parent 7cdfaf05
No related merge requests found
No preview for this file type
...@@ -132,7 +132,6 @@ use 0 for current version""", metavar="ISE") ...@@ -132,7 +132,6 @@ use 0 for current version""", metavar="ISE")
print e print e
if not sth_chosen: if not sth_chosen:
print("DUPA")
kernel.run() kernel.run()
if __name__ == "__main__": if __name__ == "__main__":
......
...@@ -39,7 +39,7 @@ class HdlmakeKernel(object): ...@@ -39,7 +39,7 @@ class HdlmakeKernel(object):
return self.modules_pool.get_top_module() return self.modules_pool.get_top_module()
def run(self): def run(self):
p.rawprint("Running automatic flow\n") p.rawprint("Running automatic flow")
tm = self.top_module tm = self.top_module
...@@ -370,10 +370,10 @@ class HdlmakeKernel(object): ...@@ -370,10 +370,10 @@ class HdlmakeKernel(object):
def clean_modules(self): def clean_modules(self):
p.rawprint("Removing fetched modules..") p.rawprint("Removing fetched modules..")
remove_list = [m for m in self.modules_pool if m.source in ["svn", "git"] and m.isfetched] remove_list = [m for m in self.modules_pool if m.source in ["svn", "git"] and m.isfetched]
remove_list.reverse() #we will remove modules in backward order
if len(remove_list): if len(remove_list):
for m in remove_list: for m in remove_list:
p.rawprint("\t" + m.url + " in " + m.path) p.rawprint("\t" + m.url + " [from: " + m.path + "]")
for m in remove_list:
m.remove_dir_from_disk() m.remove_dir_from_disk()
else: else:
p.rawprint("There are no modules to be removed") p.rawprint("There are no modules to be removed")
......
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