__apt_ppa: /enabled/present/ -e /disabled/absent/

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

cdist/conf/type/__apt_ppa/explorer/state

@@ -29,5 +29,5 @@ repo_name="${name#ppa:}"
 repo_file_name="$(echo "$repo_name" | sed "s:\/:\-:")-${DISTRIB_CODENAME}.list"
 
 [ -s "/etc/apt/sources.list.d/${repo_file_name}" ] \
-   && echo enabled || echo disabled
+   && echo present || echo absent
 

cdist/conf/type/__apt_ppa/gencode-remote

@@ -22,14 +22,16 @@ name="$__object_id"
 state_should="$(cat "$__object/parameter/state")"
 state_is="$(cat "$__object/explorer/state")"
 
-if [ "$state_should" != "$state_is" ]; then
-   case "$state_should" in
-      enabled)
-         echo add-apt-repository \"$name\"
-      ;;
-      disabled)
-         echo remove-apt-repository \"$name\"
-      ;;
-   esac
+if [ "$state_should" == "$state_is" ]; then
+   # Nothing to do, move along
+   exit 0
 fi
 
+case "$state_should" in
+   present)
+      echo add-apt-repository \"$name\"
+   ;;
+   absent)
+      echo remove-apt-repository \"$name\"
+   ;;
+esac

cdist/conf/type/__apt_ppa/man.text

@@ -16,7 +16,7 @@ This cdist type allows manage ubuntu ppa repositories.
 REQUIRED PARAMETERS
 -------------------
 state::
-   The state the ppa should be in, either "enabled" or "disabled".
+   The state the ppa should be in, either "present" or "absent".
 
 
 OPTIONAL PARAMETERS
@@ -29,10 +29,10 @@ EXAMPLES
 
 --------------------------------------------------------------------------------
 # Enable a ppa repository
-__apt_ppa ppa:sans-intern/missing-bits --state enabled
+__apt_ppa ppa:sans-intern/missing-bits --state present
 
 # Disable a ppa repository
-__apt_ppa ppa:sans-intern/missing-bits --state disabled
+__apt_ppa ppa:sans-intern/missing-bits --state absent
 --------------------------------------------------------------------------------