tza/pyren
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

9q fix#9

Browse Source
This commit is contained in:
shrlnm 2019-10-23 09:17:12 +03:00
parent 7049729416
commit d5cbb6aa8a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyren/mod_ddt.py
View File

@ -142,7 +142,7 @@ class DDT():
# Load XML # Load XML
if not self.decu.ecufname.startswith(mod_globals.ddtroot): if not self.decu.ecufname.startswith(mod_globals.ddtroot):
tmp_f_name = self.decu.ecufname.split('/')[-1] tmp_f_name = self.decu.ecufname.split('/')[-1]
self.decu.ecufname = mod_globals.ddtroot+'/ecus/'+tmp_f_name self.decu.ecufname = 'ecus/'+tmp_f_name
if not mod_db_manager.file_in_ddt(self.decu.ecufname): if not mod_db_manager.file_in_ddt(self.decu.ecufname):
print "No such file: ", self.decu.ecufname print "No such file: ", self.decu.ecufname

4
pyren/mod_ddt_ecu.py
View File

@ -304,8 +304,8 @@ class DDTECU():
fname = fname.strip() fname = fname.strip()
if len(fname): if len(fname):
self.ecufname = mod_globals.ddtroot+'/ecus/'+fname self.ecufname = 'ecus/'+fname
if os.path.isfile(self.ecufname): if mod_db_manager.file_in_ddt(self.ecufname):
break break
else: else:
print "No such file :",self.ecufname print "No such file :",self.ecufname

4
pyren/mod_ddt_utils.py
View File

@ -126,9 +126,13 @@ def loadECUlist():
eculist[Address]["targets"][href]['Projects'] = pjcl eculist[Address]["targets"][href]['Projects'] = pjcl
ail = [] ail = []
ais = target.findall("ns0:AutoIdents", ns) ais = target.findall("ns0:AutoIdents", ns)
if len(ais)==0:
ais = target.findall("AutoIdents")
if len(ais): if len(ais):
for ai in ais: for ai in ais:
AutoIdents = ai.findall("ns0:AutoIdent", ns) AutoIdents = ai.findall("ns0:AutoIdent", ns)
if len(AutoIdents)==0:
AutoIdents = ai.findall("AutoIdent")
if len(AutoIdents): if len(AutoIdents):
for AutoIdent in AutoIdents: for AutoIdent in AutoIdents:
air = {} air = {}