don't use before if ensure != latest

miraheze · Aug 2, 2017 · 3f0ce9a · 3f0ce9a
1 parent 369841b
commit 3f0ce9a
Showing 1 changed file with 28 additions and 12 deletions.
diff --git a/modules/git/manifests/clone.pp b/modules/git/manifests/clone.pp
@@ -85,18 +85,34 @@
             }
 
             if $branch {
-                exec { "git_checkout_${title}":
-                    cwd         => $directory,
-                    command     => "${git} checkout ${branch}",
-                    provider    => shell,
-                    environment => $env,
-                    unless      => "${git} rev-parse --abbrev-ref HEAD | grep ${branch}",
-                    user        => $owner,
-                    group       => $group,
-                    umask       => $umask,
-                    path        => '/usr/bin:/bin',
-                    require     => Exec["git_clone_${title}"],
-                    before      => Exec["git_pull_${title}"],
+                if $ensure == 'latest' {
+                    exec { "git_checkout_${title}":
+                        cwd         => $directory,
+                        command     => "${git} checkout ${branch}",
+                        provider    => shell,
+                        environment => $env,
+                        unless      => "${git} rev-parse --abbrev-ref HEAD | grep ${branch}",
+                        user        => $owner,
+                        group       => $group,
+                        umask       => $umask,
+                        path        => '/usr/bin:/bin',
+                        require     => Exec["git_clone_${title}"],
+                        before      => Exec["git_pull_${title}"],
+                    }
+                } 
+                else {
+                    exec { "git_checkout_${title}":
+                        cwd         => $directory,
+                        command     => "${git} checkout ${branch}",
+                        provider    => shell,
+                        environment => $env,
+                        unless      => "${git} rev-parse --abbrev-ref HEAD | grep ${branch}",
+                        user        => $owner,
+                        group       => $group,
+                        umask       => $umask,
+                        path        => '/usr/bin:/bin',
+                        require     => Exec["git_clone_${title}"],
+                    }
                 }
             }