Merge branch 'packagefix'

conf/type/__package/man.text

@@ -17,7 +17,7 @@ It dispatches the actual work to the package system dependant types.
 REQUIRED PARAMETERS
 -------------------
 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

conf/type/__package_apt/gencode-remote

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

conf/type/__package_apt/man.text

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

conf/type/__package_pacman/gencode-remote

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

conf/type/__package_pacman/man.text

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

conf/type/__package_yum/gencode-remote

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

conf/type/__package_yum/man.text

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

doc/changelog

@@ -3,6 +3,8 @@
 	* New type __debconf_set_selections
 	* New explorer os_version
 	* 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
 	* Removed --preseed support from __package_apt
 	* explorer/os: gained Fedora support