From 79d5bba4674185b9db06f40b4976ce447bfb2f38 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 22 May 2013 15:05:52 -0400
Subject: pass any require => parameters that are in the try::file resource so
 dependencies can be satisfied

Change-Id: I10d3ebe6a3009ebe01e578ea582d00dc930689ed
---
 puppet/modules/try/manifests/file.pp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/try/manifests')

diff --git a/puppet/modules/try/manifests/file.pp b/puppet/modules/try/manifests/file.pp
index 406c0b7a..47a8c269 100644
--- a/puppet/modules/try/manifests/file.pp
+++ b/puppet/modules/try/manifests/file.pp
@@ -18,7 +18,10 @@ define try::file (
     file { "$name":
       ensure => $ensure,
       target => $target,
-      require => Exec["check_${name}"],
+      require => $require ? {
+        undef   => Exec["check_${name}"],
+        default => [ $require, Exec["check_${name}"] ]
+      },
       loglevel => info;
     }
   }
@@ -37,6 +40,10 @@ define try::file (
       exec { "restore_${name}":
         command => $command,
         cwd => $file_dirname,
+        require => $require ? {
+          undef   => undef,
+          default => [ $require ]
+        },
         loglevel => info;
       }
     } else {
@@ -44,6 +51,10 @@ define try::file (
         unless => "/usr/bin/test -e '${target}'",
         command => $command,
         cwd => $file_dirname,
+        require => $require ? {
+          undef   => undef,
+          default => [ $require ]
+        },
         loglevel => info;
       }
     }
-- 
cgit v1.2.3