Skip to content

Commit 146b361

Browse files
authored
Merge pull request CactuseSecurity#3010 from CactuseSecurity/develop
Develop fix import default error value when no changes found
2 parents 1ee23e3 + 73940c1 commit 146b361

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

roles/importer/files/importer/common.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class ImportState():
8888
Config2import: dict
8989
ConfigChangedSinceLastImport: bool
9090
FwoConfig: dict
91-
MgmDetails: dict
91+
MgmDetails: ManagementDetails
9292
FullMgmDetails: dict
9393
ImportId: int
9494
Jwt: str
@@ -113,7 +113,7 @@ def __init__(self, debugLevel, configChangedSinceLastImport, fwoConfig, mgmDetai
113113
self.ForceImport = force
114114

115115
def __str__(self):
116-
return f"{str(self.ManagementDetails)}({self.age})"
116+
return f"{str(self.MgmDetails)}(ImportId: {self.ImportId})"
117117

118118
def setImportFileName(self, importFileName):
119119
self.ImportFileName = importFileName
@@ -347,7 +347,7 @@ def setImportLock(importState):
347347

348348
def get_config_from_api(importState, full_config_json, config2import, import_tmp_path='.', limit=150):
349349
logger = getFwoLogger()
350-
errors_found = 1
350+
errors_found = 0
351351

352352
try: # pick product-specific importer:
353353
pkg_name = importState.MgmDetails.DeviceTypeName.lower().replace(' ', '') + importState.MgmDetails.DeviceTypeVersion

0 commit comments

Comments
 (0)