[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Daniel Pittman]

The following commit has been merged in the experimental branch:
commit 455d1978c31c56ad95dd8289552c99891d09bdee
Author: Daniel Pittman <daniel at rimspace.net>
Date:   Thu Mar 3 18:11:22 2011 -0800

    (#6582) Don't demand the checkout be named 'puppet'.
    
    As part of implementing the fixture support I hard-coded the assumption that
    the git checkout was a directory named 'puppet'; this broke on our CI server,
    and would break for anyone else who didn't follow that default.
    
    This commit eliminates that assumption and depends only on the appropriate
    part of the input filename.
    
    Reviewed-By: Paul Berry <paul at puppetlabs.com>

diff --git a/spec/lib/puppet_spec/fixtures.rb b/spec/lib/puppet_spec/fixtures.rb
index 96bb1e3..7f6bc2a 100644
--- a/spec/lib/puppet_spec/fixtures.rb
+++ b/spec/lib/puppet_spec/fixtures.rb
@@ -5,7 +5,7 @@ module PuppetSpec::Fixtures
   def my_fixture_dir
     callers = caller
     while line = callers.shift do
-      next unless found = line.match(%r{puppet/spec/(.*)_spec\.rb:})
+      next unless found = line.match(%r{/spec/(.*)_spec\.rb:})
       return fixtures(found[1])
     end
     fail "sorry, I couldn't work out your path from the caller stack!"

-- 
Puppet packaging for Debian