From 346f1f8af34de7a6a8fd21dc521211d31b2f33c0 Mon Sep 17 00:00:00 2001
From: Jonas Weber <github@jonasw.de>
Date: Wed, 12 Sep 2018 11:36:06 +0200
Subject: [PATCH 1/2] Send messages when installing packages via __package_apt

---
 cdist/conf/type/__package_apt/gencode-remote | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cdist/conf/type/__package_apt/gencode-remote b/cdist/conf/type/__package_apt/gencode-remote
index d9cc52b7..39584e30 100755
--- a/cdist/conf/type/__package_apt/gencode-remote
+++ b/cdist/conf/type/__package_apt/gencode-remote
@@ -78,9 +78,11 @@ case "$state_should" in
             name="${name}=${version}"
         fi
         echo $aptget install $target_release \"$name\"
+        echo "installed" >> "$__messages_out"
     ;;
     absent)
         echo $aptget remove $purgeparam \"$name\"
+        echo "removed" >> "$__messages_out"
     ;;
     *)
         echo "Unknown state: $state_should" >&2

From b3f3b907a49759db18f95ed48b7890328a755e96 Mon Sep 17 00:00:00 2001
From: Jonas Weber <github@jonasw.de>
Date: Wed, 12 Sep 2018 11:35:23 +0200
Subject: [PATCH 2/2] Quote aptget command and params, simplify explorer

---
 cdist/conf/type/__package_apt/explorer/state | 2 +-
 cdist/conf/type/__package_apt/gencode-remote | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cdist/conf/type/__package_apt/explorer/state b/cdist/conf/type/__package_apt/explorer/state
index 658429ac..7ccd6fce 100755
--- a/cdist/conf/type/__package_apt/explorer/state
+++ b/cdist/conf/type/__package_apt/explorer/state
@@ -30,7 +30,7 @@ fi
 # Except dpkg failing, if package is not known / installed
 packages="$(apt-cache showpkg "$name" | sed -e "1,/Reverse Provides:/d" | cut -d ' ' -f 1) $name"
 for p in $packages; do
-    if [ -n "$(dpkg -s "$p" 2>/dev/null | grep "^Status: install ok installed$")" ]; then
+    if dpkg -s "$p" 2>/dev/null | grep --quiet "^Status: install ok installed$" ; then
        version=$(dpkg -s "$p" 2>/dev/null | grep "^Version:" | cut -d ' ' -f 2)
        echo "present $p $version"
        exit 0
diff --git a/cdist/conf/type/__package_apt/gencode-remote b/cdist/conf/type/__package_apt/gencode-remote
index 39584e30..cbe14787 100755
--- a/cdist/conf/type/__package_apt/gencode-remote
+++ b/cdist/conf/type/__package_apt/gencode-remote
@@ -77,11 +77,11 @@ case "$state_should" in
         if [ -n "$version" ]; then
             name="${name}=${version}"
         fi
-        echo $aptget install $target_release \"$name\"
+        echo "$aptget install $target_release \"$name\""
         echo "installed" >> "$__messages_out"
     ;;
     absent)
-        echo $aptget remove $purgeparam \"$name\"
+        echo "$aptget remove $purgeparam \"$name\""
         echo "removed" >> "$__messages_out"
     ;;
     *)