summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorScott O'Neil <scott@cpanel.net>2011-11-08 18:46:41 -0600
committerScott O'Neil <scott@cpanel.net>2011-11-08 18:46:41 -0600
commit328d88ee590e6fa7ee64806fbfd9e09fa5ead979 (patch)
tree68305df167d638b26af8316a5b6b4be683671e79 /lib
parent8e16891d95c58408ae78f05824da0169723d2226 (diff)
downloadpuppet-vcsrepo-328d88ee590e6fa7ee64806fbfd9e09fa5ead979.tar.gz
puppet-vcsrepo-328d88ee590e6fa7ee64806fbfd9e09fa5ead979.tar.bz2
Run update_owner_and_excludes after update_preferences and get_revision
These are called when the type is retrieve'd. Without this, the ownerships for any .git metafiles fetch'd durring the retrieve will be owned by root. This patch fixes that by invoking update_owner_and_excludes after fetch'ng
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/provider/vcsrepo/git.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb
index 51e48a9..6cbda67 100644
--- a/lib/puppet/provider/vcsrepo/git.rb
+++ b/lib/puppet/provider/vcsrepo/git.rb
@@ -96,6 +96,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
def update_references
at_path do
git_with_identity('fetch', '--tags', 'origin')
+ update_owner_and_excludes
end
end
@@ -262,6 +263,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
end
current = @resource.value(:revision) if current == canonical
end
+ update_owner_and_excludes
return current
end