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

Merge branch 'packagefix'

Browse source
This commit is contained in:
Nico Schottelius 2011-04-05 16:49:12 +02:00
commit 8bf756f242
8 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/type/__package/man.text
View file

@ -17,7 +17,7 @@ It dispatches the actual work to the package system dependant types.
REQUIRED PARAMETERS REQUIRED PARAMETERS
------------------- -------------------
state:: state::
The state the package should be in, either "installed" or "uninstalled" The state the package should be in, either "installed" or "removed"
OPTIONAL PARAMETERS OPTIONAL PARAMETERS

2
conf/type/__package_apt/gencode-remote
View file

@ -46,7 +46,7 @@ case "$state" in
echo $aptget install \"$name\" echo $aptget install \"$name\"
fi fi
;; ;;
uninstalled) removed)
# Remove only if existent # Remove only if existent
if [ -n "$is_installed" ]; then if [ -n "$is_installed" ]; then
echo $aptget remove \"$name\" echo $aptget remove \"$name\"

4
conf/type/__package_apt/man.text
View file

@ -17,7 +17,7 @@ manage packages.
REQUIRED PARAMETERS REQUIRED PARAMETERS
------------------- -------------------
state:: state::
Either "installed" or "deinstalled". Either "installed" or "removed".
OPTIONAL PARAMETERS OPTIONAL PARAMETERS
@ -37,7 +37,7 @@ __package_apt zsh --state installed
__package_apt webserver --state installed --name nginx __package_apt webserver --state installed --name nginx
# Remove obsolete package # Remove obsolete package
__package_apt puppet --state deinstalled __package_apt puppet --state removed
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

2
conf/type/__package_pacman/gencode-remote
View file

@ -44,7 +44,7 @@ case "$state" in
echo pacman "$pacopts" -S \"$name\" echo pacman "$pacopts" -S \"$name\"
fi fi
;; ;;
uninstalled) removed)
if [ "$pkg_version" ]; then if [ "$pkg_version" ]; then
echo pacman "$pacopts" -R \"$name\" echo pacman "$pacopts" -R \"$name\"
fi fi

4
conf/type/__package_pacman/man.text
View file

@ -17,7 +17,7 @@ packages.
REQUIRED PARAMETERS REQUIRED PARAMETERS
------------------- -------------------
state:: state::
Either "installed" or "deinstalled". Either "installed" or "removed".
OPTIONAL PARAMETERS OPTIONAL PARAMETERS
@ -37,7 +37,7 @@ __package_pacman zsh --state installed
__package_pacman python --state installed --name python2 __package_pacman python --state installed --name python2
# Remove obsolete package # Remove obsolete package
__package_pacman puppet --state deinstalled __package_pacman puppet --state removed
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

2
conf/type/__package_yum/gencode-remote
View file

@ -39,7 +39,7 @@ case "$state" in
echo yum $opts install \"$name\" echo yum $opts install \"$name\"
fi fi
;; ;;
uninstalled) removed)
if ! grep -q "$not_installed" "$__object/explorer/pkg_version"; then if ! grep -q "$not_installed" "$__object/explorer/pkg_version"; then
echo yum $opts remove \"$name\" echo yum $opts remove \"$name\"
fi fi

4
conf/type/__package_yum/man.text
View file

@ -18,7 +18,7 @@ slightly confusing error message "Error: Nothing to do".
REQUIRED PARAMETERS REQUIRED PARAMETERS
------------------- -------------------
state:: state::
Either "installed" or "deinstalled". Either "installed" or "removed".
OPTIONAL PARAMETERS OPTIONAL PARAMETERS
@ -38,7 +38,7 @@ __package_yum zsh --state installed
__package_yum python --state installed --name python2 __package_yum python --state installed --name python2
# Remove obsolete package # Remove obsolete package
__package_yum puppet --state deinstalled __package_yum puppet --state removed
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

2
doc/changelog
View file

@ -3,6 +3,8 @@
* New type __debconf_set_selections * New type __debconf_set_selections
* New explorer os_version * New explorer os_version
* Fix Type __group in case of __group NAME syntax * Fix Type __group in case of __group NAME syntax
* Fix __package* types: consistently name --state removed instead of
uninstalled or deinstalled
* Type __package gained Fedora support * Type __package gained Fedora support
* Removed --preseed support from __package_apt * Removed --preseed support from __package_apt
* explorer/os: gained Fedora support * explorer/os: gained Fedora support