I'm having trouble getting git mail_patches to work on my
tickets/2.6.x/6718 branch, so I'm sending this patch manually.
This fixes the bug (#6718) whereby it is not possible to create a new
service.
diff --git a/lib/puppet/provider/service/runit.rb
b/lib/puppet/provider/service/runit.rb
index 0315b95..d269c58 100644
--- a/lib/puppet/provider/service/runit.rb
+++ b/lib/puppet/provider/service/runit.rb
@@ -67,6 +67,9 @@ Puppet::Type.type(:service).provide :runit, :parent =>
:daemontools do
end
def status
+ # If the service symlink doesn't exist then
+ # return without checking service status
+ return :stopped if ! FileTest.symlink?(self.service)
begin
output = sv "status", self.daemon
return :running if output =~ /^run: /
Commit here:
https://github.com/robinbowes/puppet/commit/6360f77ea5bc31446a96f813de126f9601dbe5df
I did try running "rake mail_patches" on my ticket/2.6.x/6718 branch,
but get this error:
[robin@hero puppet]$ git branch
master
* ticket/2.6.x/6718
[robin@hero puppet]$ rake mail_patches
(in /home/robin/workspace/puppet)
git format-patch -C -M -s -n --subject-prefix='PATCH/puppet' 2.6.x..HEAD
fatal: ambiguous argument '2.6.x..HEAD': unknown revision or path not in
the working tree.
Use '--' to separate paths from revisions
rake aborted!
Command failed with status (128): [git format-patch -C -M -s -n
--subject-pre...]
(See full trace by running task with --trace)
Any idea how to fix that?
R.
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to
puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
