Module: check_mk Branch: master Commit: 5756d53a1d048039927a2e69b977f2faacab9dbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5756d53a1d0480… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Mar 25 16:50:09 2015 +0100 #2108 FIX win_bios win_disks win_system win_video: these inventory checks can now handle colons in the output --- .werks/2108 | 10 ++++++++++ ChangeLog | 1 + inventory/win_bios | 1 - inventory/win_disks | 5 ++++- inventory/win_system | 5 ++++- inventory/win_video | 5 ++++- 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.werks/2108 b/.werks/2108 new file mode 100644 index 0000000..6eaa070 --- /dev/null +++ b/.werks/2108 @@ -0,0 +1,10 @@ +Title: win_bios win_disks win_system win_video: these inventory checks can now handle colons in the output +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427298555 + + diff --git a/ChangeLog b/ChangeLog index babe25f..3c337dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -435,6 +435,7 @@ * 1995 FIX: dmidecode: Fix parsing when memory devices are listed before controller * 2147 FIX: Fixed exception in HW-/SW-Inventory GUI with special characters in inventorized data... * 2148 FIX: win_os: Fixed inventory of OS with older powershell versions + * 2108 FIX: win_bios win_disks win_system win_video: these inventory checks can now handle colons in the output 1.2.6b1: diff --git a/inventory/win_bios b/inventory/win_bios index 4a79180..f5a6ef2 100644 --- a/inventory/win_bios +++ b/inventory/win_bios @@ -45,7 +45,6 @@ def inv_win_bios(info): if len(line) > 2: line = [ line[0], ":".join(line[1:]) ] varname, value = line - varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) if varname == "BIOSVersion": diff --git a/inventory/win_disks b/inventory/win_disks index 1feba35..018458e 100644 --- a/inventory/win_disks +++ b/inventory/win_disks @@ -60,7 +60,10 @@ def inv_win_disks(info): node = inv_tree("hardware.storage.disks:") array = {} - for varname, value in info: + for line in info: + if len(line) > 2: + line = [ line[0], ":".join(line[1:]) ] + varname, value = line varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) if varname == "Manufacturer": diff --git a/inventory/win_system b/inventory/win_system index 2016694..ddf68d6 100644 --- a/inventory/win_system +++ b/inventory/win_system @@ -37,7 +37,10 @@ def inv_win_system(info): node = inv_tree("hardware.system.") - for varname, value in info: + for line in info: + if len(line) > 2: + line = [ line[0], ":".join(line[1:]) ] + varname, value = line varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) if varname == "SerialNumber": diff --git a/inventory/win_video b/inventory/win_video index 127b3de..412fed1 100644 --- a/inventory/win_video +++ b/inventory/win_video @@ -39,7 +39,10 @@ def inv_win_video(info): node = inv_tree("hardware.video:") array = {} - for varname, value in info: + for line in info: + if len(line) > 2: + line = [ line[0], ":".join(line[1:]) ] + varname, value = line varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) if varname == "Name":