Merge branch 'develop' into feature/imports

This commit is contained in:
spencershepard 2022-03-01 20:27:33 -08:00 committed by GitHub
commit 125c5f9262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -760,8 +760,7 @@ class RotorOpsMission:
def importObjects(self): def importObjects(self):
os.chdir(self.imports_dir) os.chdir(self.imports_dir)
logger.info("Looking for import .miz files in '" + os.getcwd()) logger.info("Looking for import .miz files in '" + os.getcwd())
@ -776,7 +775,7 @@ class RotorOpsMission:
logger.error( logger.error(
group.units[0].name + " IMPORT group's unit name cannot start with 'IMPORT'. Check the scenario template.") group.units[0].name + " IMPORT group's unit name cannot start with 'IMPORT'. Check the scenario template.")
raise Exception("Scenario file error: " + group.units[0].name + " IMPORT group's unit name cannot start with 'IMPORT'") raise Exception("Scenario file error: " + group.units[0].name + " IMPORT group's unit name cannot start with 'IMPORT'")
# trim the groupname to our filename convention # trim the groupname to our filename convention
filename = group.name.removeprefix(prefix) filename = group.name.removeprefix(prefix)
i = filename.find('-') i = filename.find('-')