# HG changeset patch # User Eric Joseph-Alexandre # Date 1247475156 -7200 # Node ID 894c779750dc00979a286e5ffbabbd9adadbc121 # Parent db6394fb176ffcac4984dfc2d8b8cbfd7b7d54fe Fix: ocsinventory-agent, remove escape chars from tazpkg list output. diff -r db6394fb176f -r 894c779750dc ocsinventory-agent/stuff/Tazpkg.pm --- a/ocsinventory-agent/stuff/Tazpkg.pm Sun Jul 12 23:18:03 2009 +0200 +++ b/ocsinventory-agent/stuff/Tazpkg.pm Mon Jul 13 10:52:36 2009 +0200 @@ -6,18 +6,22 @@ sub check { can_run("tazpkg") } sub run { - my $params = shift; - my $inventory = $params->{inventory}; + my $params = shift; + my $inventory = $params->{inventory}; -# use dpkg-query -W -f='${Package}|||${Version}\n' - foreach (`tazpkg list `){ - if (/^(\S+)\s+([0-9]+.*)\s+(.*)/) { - $inventory->addSoftwares({ - 'NAME' => $1, - 'VERSION' => $2, - }); - } - } + # use tazpkg list\n' + foreach (`tazpkg list `){ + next if (/List of/); + next if (/packages installed/); + + if (/^(\S+)\[24G\s+(\S+)\[42G\s+(\S+)/) { + $inventory->addSoftwares({ + 'NAME' => $1, + 'VERSION' => $2, + 'COMMENTS' => $3 + }); + } + } }