diff options
| author | Dominic Cleal <dcleal@redhat.com> | 2010-11-27 13:36:04 +0000 |
|---|---|---|
| committer | Dominic Cleal <dcleal@redhat.com> | 2010-11-27 13:36:04 +0000 |
| commit | afe2d014feb2210a8666c93465d11e9c9d555f8b (patch) | |
| tree | 208f5ac82b2c29610d2021821c8fca9b079e638b /tasks | |
| parent | 143fc744a839affd328234fca26246d49d15d3d8 (diff) | |
| parent | 4b35402ba85d8842d757becec5c8a7bf4d6f6654 (diff) | |
Merge branch 'master' of github.com:domcleal/puppet into master-old
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/rake/git_workflow.rake | 13 | ||||
| -rw-r--r-- | tasks/rake/tracdocs.rake | 8 |
2 files changed, 12 insertions, 9 deletions
diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake index b2f96c603..4c39f98de 100644 --- a/tasks/rake/git_workflow.rake +++ b/tasks/rake/git_workflow.rake @@ -103,10 +103,21 @@ task :mail_patches do # Create all of the patches sh "git format-patch -C -M -s -n --subject-prefix='PATCH/puppet' #{parent}..HEAD" + # Add info to the patches + additional_info = "Local-branch: #{branch}\n" + files = Dir.glob("00*.patch") + files.each do |file| + contents = File.read(file) + contents.sub!(/^---\n/, "---\n#{additional_info}") + File.open(file, 'w') do |file_handle| + file_handle.print contents + end + end + # And then mail them out. # If we've got more than one patch, add --compose - if Dir.glob("00*.patch").length > 1 + if files.length > 1 compose = "--compose" else compose = "" diff --git a/tasks/rake/tracdocs.rake b/tasks/rake/tracdocs.rake deleted file mode 100644 index d26d8fc17..000000000 --- a/tasks/rake/tracdocs.rake +++ /dev/null @@ -1,8 +0,0 @@ -task :tracdocs do - require 'puppet' - require 'puppet/util/reference' - Puppet::Util::Reference.references.each do |ref| - sh "puppetdoc -m trac -r #{ref.to_s}" - end -end - |