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

[Paul Berry]

The following commit has been merged in the experimental branch:
commit bf11e7c7aa4ce3337c6697d0b25ee2cdd28ba10c
Author: Paul Berry <paul at puppetlabs.com>
Date:   Thu Nov 11 10:18:04 2010 -0800

    Maint: Move "Local-branch:" info below "---"
    
    When running "rake mail_patches", moved the "Local-branch:" info lines
    below the "---" line in the e-mail, so that if someone applies the
    patch using "git am", the "Local-branch" notation won't show up in the
    commit message.

diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake
index c275bba..4c39f98 100644
--- a/tasks/rake/git_workflow.rake
+++ b/tasks/rake/git_workflow.rake
@@ -108,7 +108,7 @@ task :mail_patches do
     files = Dir.glob("00*.patch")
     files.each do |file|
         contents = File.read(file)
-        contents.sub!(/^---$/, "#{additional_info}---")
+        contents.sub!(/^---\n/, "---\n#{additional_info}")
         File.open(file, 'w') do |file_handle|
             file_handle.print contents
         end

-- 
Puppet packaging for Debian