[SCM] patch-parser packaging branch, master, updated. cfa38bf092d17f9cd45dcdbdcc112dce15e24bed

Harald Sitter apachelogger-guest at moszumanska.debian.org
Mon May 4 10:09:39 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/patch-parser.git;a=commitdiff;h=20a8d6c

The following commit has been merged in the master branch:
commit 20a8d6c548553291ef0d6e064158a3814079b6d6
Author: Harald Sitter <sitter at kde.org>
Date:   Mon May 4 12:07:19 2015 +0200

    resolve relative template paths a bit more reliably
---
 render.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/render.rb b/render.rb
index ce341ad..b0d872f 100644
--- a/render.rb
+++ b/render.rb
@@ -45,12 +45,14 @@ Dir.chdir('cache') do
       repos << Repo.new(repo, patches)
     end
     repos.sort_by!(&:name)
-    html = Haml::Engine.new(File.read('../views/patches.html.haml')).render(repos)
+    template_path = File.expand_path('views/patches.html.haml', __FILE__)
+    html = Haml::Engine.new(File.read(template_path)).render(repos)
     File.write("../#{branch}.html", html)
   end
 end
 
-html = Haml::Engine.new(File.read('views/index.html.haml')).render(BRANCHES)
+template_path = File.expand_path('views/index.html.haml', __FILE__)
+html = Haml::Engine.new(template_path).render(BRANCHES)
 File.write('index.html', html)
 
 File.delete('patch.html') if File.exist?('patch.html')

-- 
patch-parser packaging



More information about the pkg-kde-commits mailing list