From: TP Honey <tphoney@users.noreply.github.com>
Date: Thu, 21 Jun 2018 15:38:15 +0000 (+0100)
Subject: Merge pull request #754 from paladox/patch-1
X-Git-Tag: 5.0.0~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7fc436b6f7efd749df44bec3ab16f5aafb210a79;hp=630580d1ce3c609865e31598198e7c55dda9a6ef;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #754 from paladox/patch-1

Remove .length from variable $pin_release in app
---

diff --git a/templates/pin.pref.epp b/templates/pin.pref.epp
index 7991332..29082e8 100644
--- a/templates/pin.pref.epp
+++ b/templates/pin.pref.epp
@@ -1,14 +1,14 @@
 <%- | $name, $pin_release, $release, $codename, $release_version, $component, $originator, $label, $version, $origin, $explanation, $packages_string, $priority | -%>
 <%-
 $pin =
-if $pin_release.length > 0 {
+if $pin_release != '' {
   $options = [
-    if $release         { "a=${release}" },
-    if $codename        { "n=${codename}" },
-    if $release_version { "v=${release_version}"},
-    if $component       { "c=${component}" },
-    if $originator      { "o=${originator}" },
-    if $label           { "l=${label}" },
+    if $release != ''         { "a=${release}" },
+    if $codename != ''        { "n=${codename}" },
+    if $release_version != '' { "v=${release_version}"},
+    if $component != ''       { "c=${component}" },
+    if $originator != ''      { "o=${originator}" },
+    if $label != ''           { "l=${label}" },
     ].filter |$x| { $x != undef }
    "release ${options.join(', ')}" }