Issue #1550 has been updated by jamtur01.
Status changed from Ready for Checkin to Code Insufficient
My repo at Github is the default stable. I get this when I try to rebase on
your commits:
<pre>
git rebase 0.24.x
First, rewinding head to replay your work on top of it...
HEAD is now at 11b0848 Fixed #1500 - puppetrun host regression
Applying moving autotest directory to make it possible to run autotest again
.dotest/patch:102: trailing whitespace.
.dotest/patch:112: trailing whitespace.
%r%^spec/.*\.rb$% => kernel.proc { |filename, _|
.dotest/patch:113: trailing whitespace.
filename
.dotest/patch:115: trailing whitespace.
%r%^lib/(.*)\.rb$% => kernel.proc { |_, m|
.dotest/patch:116: trailing whitespace.
["spec/#{m[1]}_spec.rb"]
error: autotest/discover.rb: already exists in index
error: autotest/puppet_rspec.rb: already exists in index
error: autotest/rspec.rb: already exists in index
error: spec/lib/autotest/discover.rb: does not exist in index
error: spec/lib/autotest/puppet_rspec.rb: does not exist in index
error: spec/lib/autotest/rspec.rb: does not exist in index
error: spec/plugins/mock_frameworks/flexmock.rb: does not exist in index
error: spec/plugins/mock_frameworks/mocha.rb: does not exist in index
error: spec/plugins/mock_frameworks/rr.rb: does not exist in index
error: spec/plugins/mock_frameworks/rspec.rb: does not exist in index
Using index info to reconstruct a base tree...
<stdin>:102: trailing whitespace.
<stdin>:112: trailing whitespace.
%r%^spec/.*\.rb$% => kernel.proc { |filename, _|
<stdin>:113: trailing whitespace.
filename
<stdin>:115: trailing whitespace.
%r%^lib/(.*)\.rb$% => kernel.proc { |_, m|
<stdin>:116: trailing whitespace.
["spec/#{m[1]}_spec.rb"]
warning: squelched 8 whitespace errors
warning: 13 lines add whitespace errors.
Falling back to patching base and 3-way merge...
warning: too many files, skipping inexact rename detection
CONFLICT (rename/delete): Renamed
spec/lib/autotest/puppet_rspec.rb->autotest/puppet_rspec.rb in moving autotest
directory to make it possible to run autotest again and deleted in HEAD
CONFLICT (rename/delete): Renamed spec/lib/autotest/rspec.rb->autotest/rspec.rb
in moving autotest directory to make it possible to run autotest again and
deleted in HEAD
CONFLICT (rename/delete): Renamed
spec/plugins/mock_frameworks/flexmock.rb->vendor/gems/rspec/plugins/mock_frameworks/flexmock.rb
in HEAD and deleted in moving autotest directory to make it possible to run
autotest again
CONFLICT (rename/delete): Renamed
spec/plugins/mock_frameworks/mocha.rb->vendor/gems/rspec/plugins/mock_frameworks/mocha.rb
in HEAD and deleted in moving autotest directory to make it possible to run
autotest again
CONFLICT (rename/delete): Renamed
spec/plugins/mock_frameworks/rr.rb->vendor/gems/rspec/plugins/mock_frameworks/rr.rb
in HEAD and deleted in moving autotest directory to make it possible to run
autotest again
Failed to merge in the changes.
Patch failed at 0001.
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
</pre>
----------------------------------------
Bug #1550: should be able to specify multiple template directories
http://projects.reductivelabs.com/issues/show/1550
Author: thom
Status: Code Insufficient
Priority: Normal
Assigned to: pnasrat
Category: newfeature
Target version: 0.24.6
Complexity: Unknown
Affected version: 0.24.4
Keywords:
In much the same way as one can specify multiple module directories, it would
be very useful to specify multiple paths to search for templates.
----------------------------------------
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://reductivelabs.com/redmine/my/account
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Bugs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/puppet-bugs?hl=en
-~----------~----~----~----~------~----~------~--~---
