Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-updates-src > by-pkgid > 910dd651c6e3a41a1f59ed62373c7cd3 > files > 5

puppet-3.6.2-3.3.mga5.src.rpm

From caeb6513244c320bb1076430ae83b0d2af0f022a Mon Sep 17 00:00:00 2001
From: Clay Caviness <clay@boobah.com>
Date: Fri, 15 Jul 2016 12:34:28 -0400
Subject: [PATCH] (PUP-6508) Make tidy resources non-isomorphic

Since tidy sets path as namevar, puppet tries to create aliases for it. This means multiple tidy resources with the same path (but different matches, e.g.) will fail.
---
 lib/puppet/type/tidy.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/puppet/type/tidy.rb b/lib/puppet/type/tidy.rb
index 308452fb7d9..8142aacbec6 100644
--- a/lib/puppet/type/tidy.rb
+++ b/lib/puppet/type/tidy.rb
@@ -16,6 +16,9 @@
     actual deletion.
     "
 
+  # Tidy names are not isomorphic with the objects.
+  @isomorphic = false
+
   newparam(:path) do
     desc "The path to the file or directory to manage.  Must be fully
       qualified."