[packages/satis] patch location of twig templates
glen
glen at pld-linux.org
Wed Jan 6 22:16:34 CET 2016
commit 6e081214c793bea621ff2433481c9dfaf52d08a9
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Jan 6 23:16:14 2016 +0200
patch location of twig templates
autoload.patch | 11 +++++++++++
satis.spec | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/satis.spec b/satis.spec
index 6b15d88..b4bedf8 100644
--- a/satis.spec
+++ b/satis.spec
@@ -1,5 +1,5 @@
-%define rel 0.12
+%define rel 0.13
%define githash 48191ff
# $ git rev-list 1.0.0-alpha1..%{githash} --count
%define commits 152
diff --git a/autoload.patch b/autoload.patch
index 322337e..a65e2b0 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -24,3 +24,14 @@
$schema = json_decode(file_get_contents($schemaFile));
$validator = new Validator();
$validator->check($data, $schema);
+--- satis-1.0.0-1.alpha1.152.g48191ff.0.5/src/Composer/Satis/Builder/WebBuilder.php~ 2016-01-06 09:33:13.000000000 +0200
++++ satis-1.0.0-1.alpha1.152.g48191ff.0.5/src/Composer/Satis/Builder/WebBuilder.php 2016-01-06 23:10:27.276318960 +0200
+@@ -35,7 +35,7 @@
+ {
+ $twigTemplate = isset($this->config['twig-template']) ? $this->config['twig-template'] : null;
+
+- $templateDir = $twigTemplate ? pathinfo($twigTemplate, PATHINFO_DIRNAME) : __DIR__.'/../../../../views';
++ $templateDir = $twigTemplate ? pathinfo($twigTemplate, PATHINFO_DIRNAME) : __DIR__.'/../views';
+ $loader = new \Twig_Loader_Filesystem($templateDir);
+ $twig = new \Twig_Environment($loader);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/satis.git/commitdiff/6e081214c793bea621ff2433481c9dfaf52d08a9
More information about the pld-cvs-commit
mailing list