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

[DEBUG] correct init

Browse Source
This commit is contained in:
Edouard DUPIN 2017-04-13 23:31:29 +02:00
parent a605da450f
commit e1a8280e01
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
island/config.py
View File

@ -34,8 +34,8 @@ class Config():
config_property = tools.file_read_data(env.get_island_path_config())
element_config = config_property.split("\n")
for line in element_config:
if line[0] == "#" \
or len(line) == 0:
if len(line) == 0 \
or line[0] == "#":
# simple comment line ==> pass
pass
elif line[:5] == "repo=":

4
island/env.py
View File

@ -30,7 +30,6 @@ def get_system_base_name():
island_root_path = os.path.join(os.getcwd())
if os.path.exists(os.path.join(island_root_path, "." + get_system_base_name())) == True:
# all is good ...
debug.error("plop: " + os.path.join(island_root_path, "." + get_system_base_name()))
pass
elif os.path.exists(os.path.join(island_root_path, "..", "." + get_system_base_name())) == True:
island_root_path = os.path.join(os.getcwd(), "..")
@ -45,7 +44,8 @@ elif os.path.exists(os.path.join(island_root_path, "..", "..", "..", "..", "." +
elif os.path.exists(os.path.join(island_root_path, "..", "..", "..", "..", "..", "." + get_system_base_name())) == True:
island_root_path = os.path.join(os.getcwd(), "..", "..", "..", "..", "..")
else:
debug.error("the root path of " + get_system_base_name() + " must not be upper that 6 parent path")
#debug.error("the root path of " + get_system_base_name() + " must not be upper that 6 parent path")
pass
island_path = os.path.join(island_root_path, "." + get_system_base_name())
island_path_config = os.path.join(island_path, "config.txt")
island_path_manifest = os.path.join(island_path, "manifest")

4
island/manifest.py
View File

@ -231,9 +231,9 @@ class Manifest():
out = []
if default == None:
if self.default != None:
tmp_default = copy.deepcopy(self.default)
default = copy.deepcopy(self.default)
else:
tmp_default = copy.deepcopy(self.default_base)
default = copy.deepcopy(self.default_base)
# debug.error(" self.default=" + str(self.default))
# add all local project
for elem in self.projects: