Skip to content

H
Hdlmake
Commit 68c1b82f authored by Javier D. Garcia-Lasheras's avatar Javier D. Garcia-Lasheras
Browse files
Options

Fix broken SVN fetcher

parent 5baf592b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
hdlmake/fetch/svn.py
View file @ 68c1b82f
...@@ -41,23 +41,20 @@ class Svn(Fetcher): ...@@ -41,23 +41,20 @@ class Svn(Fetcher):
fetchto = module.fetchto() fetchto = module.fetchto()
if not os.path.exists(fetchto): if not os.path.exists(fetchto):
os.mkdir(fetchto) os.mkdir(fetchto)
cur_dir = module.pool.top_module.path
os.chdir(fetchto)
basename = path_utils.svn_basename(module.url) basename = path_utils.svn_basename(module.url)
mod_path = os.path.join(fetchto, basename) mod_path = os.path.join(fetchto, basename)
cmd = "svn checkout {0} " + module.basename cmd = "cd {0} && svn checkout {1} " + module.basename()
if module.revision: if module.revision:
cmd = cmd.format(module.url + '@' + module.revision) cmd = cmd.format(fetchto, module.url + '@' + module.revision)
else: else:
cmd = cmd.format(module.url) cmd = cmd.format(fetchto, module.url)
success = True success = True
logging.info("Checking out module %s", mod_path) logging.info("Checking out module %s", mod_path)
logging.debug(cmd) logging.debug(cmd)
if os.system(cmd) != 0: if os.system(cmd) != 0:
success = False success = False
os.chdir(cur_dir)
module.isfetched = True module.isfetched = True
module.path = os.path.join(fetchto, module.basename) module.path = os.path.join(fetchto, module.basename())
return success return success
@staticmethod @staticmethod
......
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