From 4de3254bfc1e6d66f517933857922b9ed4424dd1 Mon Sep 17 00:00:00 2001 From: Michael Arnold Date: Mon, 12 Aug 2013 14:53:27 -0700 Subject: Fix svn provider to look for '^Revision:'. SVN provider should check for '^Revision:' and not '^Last Changed Rev:'. Addresses GitHub Issue #43. --- lib/puppet/provider/vcsrepo/svn.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 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 -- cgit v1.2.3 From ed67ca757a62e6bc121a1e59386f52f8233e49d7 Mon Sep 17 00:00:00 2001 From: Michael Arnold Date: Mon, 12 Aug 2013 15:34:06 -0700 Subject: And fix the rspec test to pass. --- spec/unit/puppet/provider/vcsrepo/svn_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3