From 4d7a9157663000721dc01ab0e1887b80d64d552e Mon Sep 17 00:00:00 2001
From: Joshua Hoblitt <jhoblitt@cpan.org>
Date: Wed, 23 Oct 2013 10:36:17 -0700
Subject: [PATCH] use $owner instead of $id to avoid confusion with $::id

---
 manifests/setup.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/setup.pp b/manifests/setup.pp
index f465a25..f3793b2 100644
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -14,10 +14,10 @@ class concat::setup {
     fail("Use of private class ${name} by ${caller_module_name}")
   }
 
-  $id = $::id
-  $root_group = $id ? {
+  $owner = $::id
+  $root_group = $owner ? {
     root    => 0,
-    default => $id
+    default => $owner
   }
 
   if $::concat_basedir {
@@ -27,7 +27,7 @@ class concat::setup {
   }
 
   file { "${concatdir}/bin/concatfragments.sh":
-    owner  => $id,
+    owner  => $owner,
     group  => $root_group,
     mode   => '0755',
     source => 'puppet:///modules/concat/concatfragments.sh',
@@ -35,7 +35,7 @@ class concat::setup {
 
   file { [ $concatdir, "${concatdir}/bin" ]:
     ensure => directory,
-    owner  => $id,
+    owner  => $owner,
     group  => $root_group,
     mode   => '0750',
   }