summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Stone <aaron@serendipity.cx>2013-08-12 22:15:23 -0700
committerAaron Stone <aaron@serendipity.cx>2013-08-12 22:15:23 -0700
commita4ee585cb17751dca8cf49d9361124e438a39d87 (patch)
tree7f6d1a9d319e71574fa022094018e88989324fb8
parent6f7507a2a48ff0a58c7db026760a2eb84e382a77 (diff)
parented67ca757a62e6bc121a1e59386f52f8233e49d7 (diff)
Merge pull request #89 from razorsedge/svn_revision
SVN provider should check for '^Revision:' and not '^Last Changed Rev:'
-rw-r--r--lib/puppet/provider/vcsrepo/svn.rb4
-rw-r--r--spec/unit/puppet/provider/vcsrepo/svn_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/provider/vcsrepo/svn.rb b/lib/puppet/provider/vcsrepo/svn.rb
index bfc9b76..e0d5b21 100644
--- a/lib/puppet/provider/vcsrepo/svn.rb
+++ b/lib/puppet/provider/vcsrepo/svn.rb
@@ -66,7 +66,7 @@ Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo)
def latest
args = buildargs.push('info', '-r', 'HEAD')
at_path do
- svn(*args)[/^Last Changed Rev:\s+(\d+)/m, 1]
+ svn(*args)[/^Revision:\s+(\d+)/m, 1]
end
end
@@ -80,7 +80,7 @@ Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo)
def revision
args = buildargs.push('info')
at_path do
- svn(*args)[/^Last Changed Rev:\s+(\d+)/m, 1]
+ svn(*args)[/^Revision:\s+(\d+)/m, 1]
end
end
diff --git a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
index 675fc0b..5c03327 100644
--- a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
@@ -61,7 +61,7 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do
end
it "should use 'svn info'" do
expects_chdir
- provider.revision.should == '3' # From 'Last Changed Rev', not 'Revision'
+ provider.revision.should == '4' # From 'Revision', not 'Last Changed Rev'
end
end