fancsali/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #667 from aluuu/master

Browse source 
Fix __package_yum explorer
This commit is contained in:
Darko Poljak 2018-05-28 08:05:59 +02:00 committed by GitHub
commit 98ceebe386
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__package_yum/explorer/pkg_version
View file

@ -27,4 +27,4 @@ else
name="$__object_id" name="$__object_id"
fi fi
rpm -q --whatprovides "$name" 2>/dev/null || true rpm -q "$name" 2>/dev/null || rpm -q --whatprovides "$name" 2>/dev/null || true

11
cdist/conf/type/__package_yum/gencode-remote
View file

@ -43,10 +43,15 @@ else
opts="--assumeyes --quiet" opts="--assumeyes --quiet"
fi fi
not_installed="^no package provides" not_provided="^no package provides"
not_installed='is not installed$'
if grep -q "$not_installed" "$__object/explorer/pkg_version"; then if grep -q "$not_provided" "$__object/explorer/pkg_version"; then
state_is="absent" if grep -q "$not_installed" "$__object/explorer/pkg_version"; then
state_is="absent"
else
state_is="present"
fi
else else
state_is="present" state_is="present"
fi fi