sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

__package_pkg_openbsd: fix pkg_version explorer

Browse source 
The pkg_version explorer will fail to properly detect if a package
is installed when a package's name is present in the description of
a package (as returned by pkg_info).

Currently, trying to install libtool fails due to incorrect parsing:

    $ pkg_info | grep libtool
    libltdl-2.4.2p1     GNU libtool system independent dlopen wrapper

Additionally, trying to install nagios results in the following output:

    $ pkg_info | grep nagios
    nagios-4.0.8p3-chroot host and service monitor
    nagios-web-4.0.8p2-chroot cgis and webpages for nagios

This commit fixes detection by properly parsing pkg_info's output.
Specifically, descriptions are ignored and package names are properly
extracted.
This commit is contained in:
Philippe Grégoire 2017-09-04 13:07:49 -04:00
parent 4f078b52b1
commit b2fb38d1f4
No known key found for this signature in database
GPG key ID: A14AA6DA679C2177
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cdist/conf/type/__package_pkg_openbsd/explorer/pkg_version
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# 2011 Andi Brönnimann (andi-cdist at v-net.ch) # 2011 Andi Brönnimann (andi-cdist at v-net.ch)
# Copyright 2017, Philippe Gregoire <pg@pgregoire.xyz>
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -28,4 +29,4 @@ else
fi fi
#TODO: Is there a better way? #TODO: Is there a better way?
pkg_info | grep "$name" | sed 's .*\(-[0-9.][0-9.]*\).* \1 ' | sed 's/-//' pkg_info | grep "^$name-[0-9]" | sed 's|.*\(-[0-9][0-9.]*\).*|\1|' | sed 's/-//'