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

[DEV] add option to specify the mode of merge

Browse Source
This commit is contained in:
Edouard DUPIN 2019-08-27 23:45:54 +02:00
parent 825667f038
commit 0702c24dbd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
island/manifest.py
View File

@ -56,6 +56,7 @@ class Manifest():
self.links = [] self.links = []
self.deliver_master = "master" self.deliver_master = "master"
self.deliver_develop = "develop" self.deliver_develop = "develop"
self.deliver_mode = "merge"
# load the manifest # load the manifest
self._load() self._load()
# check error in manifest (double path ...) # check error in manifest (double path ...)
@ -240,8 +241,12 @@ class Manifest():
self.deliver_master = value_option self.deliver_master = value_option
elif type_option == "deliver_develop": elif type_option == "deliver_develop":
self.deliver_develop = value_option self.deliver_develop = value_option
elif type_option == "deliver_mode":
self.deliver_mode = value_option
if self.deliver_mode not in ["merge","fast_forward"]:
debug.error("(l:" + str(child.sourceline) + ") Parsing the manifest: option 'deliver_mode' value availlable: [merge,fast_forward]")
else: else:
debug.error("(l:" + str(child.sourceline) + ") Parsing the manifest: Unknow 'type' value availlable: [deliver_master,deliver_develop]") debug.error("(l:" + str(child.sourceline) + ") Parsing the manifest: Unknow 'type' value availlable: [deliver_master,deliver_develop,deliver_mode]")
continue continue
if child.tag == "link": if child.tag == "link":
# not managed ==> future use # not managed ==> future use