X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fmark.pp;h=b2146b0a54a6cd906e691992e43c1bdc24e312b9;hb=refs%2Fheads%2Frelease-prep;hp=d83a02c44d98f36892870c8b90e9d7f4092dba3d;hpb=ddf1ad06b7965d831573d06f3890650ed487a548;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/mark.pp b/manifests/mark.pp
index d83a02c..b2146b0 100644
--- a/manifests/mark.pp
+++ b/manifests/mark.pp
@@ -1,24 +1,38 @@
-# defined typeapt::mark
+# @summary Manages apt-mark settings
 #
 # @param setting
 #   auto, manual, hold, unhold
 #   specifies the behavior of apt in case of no more dependencies installed
-#   https://manpages.debian.org/sretch/apt/apt-mark.8.en.html
+#   https://manpages.debian.org/stable/apt/apt-mark.8.en.html
 #
 define apt::mark (
   Enum['auto','manual','hold','unhold'] $setting,
-){
-  case $setting {
-    'unhold': {
-      $unless_cmd = undef
-    }
-    default: {
-      $unless_cmd = "/usr/bin/apt-mark show${setting} ${title} | /bin/fgrep -qs ${title}"
-    }
+) {
+  if $title !~ /^[a-z0-9][a-z0-9.+\-]+$/ {
+    fail("Invalid package name: ${title}")
   }
-  exec { "/usr/bin/apt-mark ${setting} ${title}":
-    onlyif => "/usr/bin/dpkg -l ${title}",
-    unless => $unless_cmd,
+
+  if $setting == 'unhold' {
+    $unless_cmd = undef
+  } else {
+    $action = "show${setting}"
+
+    # It would be ideal if we could break out this command in to an array of args, similar
+    # to $onlyif_cmd and $command. However, in this case it wouldn't work as expected due
+    # to the inclusion of a pipe character.
+    # When passed to the exec function, the posix provider will strip everything to the right of the pipe,
+    # causing the command to return a full list of packages for the given action.
+    # The trade off is to use an interpolated string knowing that action is built from an enum value and
+    # title is pre-validated.
+    $unless_cmd = ["/usr/bin/apt-mark ${action} ${title} | grep ${title} -q"]
   }
-}
 
+  $onlyif_cmd = [['/usr/bin/dpkg', '-l', $title]]
+  $command = ['/usr/bin/apt-mark', $setting, $title]
+
+  exec { "apt-mark ${setting} ${title}":
+    command => $command,
+    onlyif  => $onlyif_cmd,
+    unless  => $unless_cmd,
+  }
+}