atria-tools/island
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update methode to clone the repository (done it in generic)

Browse Source
This commit is contained in:
Edouard DUPIN 2019-07-31 00:42:52 +02:00
parent 065b3ea6a7
commit 78f559ec21
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
island/actions/islandAction_init.py
View File

@ -84,20 +84,14 @@ def execute(_arguments):
conf.set_manifest_name(manifest_name)
conf.store()
#clone the manifest repository
cmd = "git clone " + address_manifest + " --branch " + branch + " " + env.get_island_path_manifest()
debug.info("clone the manifest")
ret = multiprocess.run_command_direct(cmd)
if ret == "":
return True
debug.info("Clone the manifest")
commands.clone(env.get_island_path_manifest(), address_manifest, branch_name=branch):
if ret == False:
# all is good, ready to get the system work corectly
return True
debug.info("'" + ret + "'")
debug.error("Init does not work")
return False
debug.info("'" + ret + "'")
debug.error("Init does not work")
return False
return True

11
island/actions/islandAction_sync.py
View File

@ -95,15 +95,16 @@ def execute(_arguments):
#clone the manifest repository
address_manifest = ""
### example git@git.plouf.com:basic_folder
cmd = "git clone " + elem.select_remote["fetch"]
address_manifest = elem.select_remote["fetch"]
if elem.select_remote["fetch"][0:4] == "git@" \
and len(elem.select_remote["fetch"][4:].split(":")) <= 1:
cmd += ":"
address_manifest += ":"
else:
cmd += "/"
cmd += elem.name + " --branch " + elem.branch + " --origin " + elem.select_remote["name"] + " " + git_repo_path
address_manifest += "/"
address_manifest += elem.name
+ " --branch " + elem.branch + " --origin " + elem.select_remote["name"] + " " + git_repo_path
debug.info("clone the repo")
ret = multiprocess.run_command_direct(cmd)
ret = commands.clone(git_repo_path, address_manifest, branch_name=elem.branch, origin=elem.select_remote["name"]):
if ret != "" \
and ret != False:
# all is good, ready to get the system work corectly