[arch-commits] Commit in python-jinja/repos/community-any (4 files)

Evangelos Foutras foutrelis at nymeria.archlinux.org
Fri Aug 9 08:27:13 UTC 2013


    Date: Friday, August 9, 2013 @ 10:27:13
  Author: foutrelis
Revision: 95311

archrelease: copy trunk to community-any

Added:
  python-jinja/repos/community-any/Fix-PrefixLoader-does-not-pass-globals-to-load.patch
    (from rev 95310, python-jinja/trunk/Fix-PrefixLoader-does-not-pass-globals-to-load.patch)
  python-jinja/repos/community-any/PKGBUILD
    (from rev 95310, python-jinja/trunk/PKGBUILD)
Deleted:
  python-jinja/repos/community-any/Fix-PrefixLoader-does-not-pass-globals-to-load.patch
  python-jinja/repos/community-any/PKGBUILD

------------------------------------------------------+
 Fix-PrefixLoader-does-not-pass-globals-to-load.patch |   52 +++----
 PKGBUILD                                             |  116 ++++++++---------
 2 files changed, 84 insertions(+), 84 deletions(-)

Deleted: Fix-PrefixLoader-does-not-pass-globals-to-load.patch
===================================================================
--- Fix-PrefixLoader-does-not-pass-globals-to-load.patch	2013-08-09 08:27:02 UTC (rev 95310)
+++ Fix-PrefixLoader-does-not-pass-globals-to-load.patch	2013-08-09 08:27:13 UTC (rev 95311)
@@ -1,26 +0,0 @@
-From 478983594423dcdb85e26ea7a02b8d1d72215db6 Mon Sep 17 00:00:00 2001
-From: Morris Jobke <morris.jobke at gmail.com>
-Date: Mon, 27 May 2013 00:54:52 +0300
-Subject: [PATCH] Fix "PrefixLoader does not pass globals to load"
-
-Fix mitsuhiko/jinja2#225
----
- jinja2/loaders.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jinja2/loaders.py b/jinja2/loaders.py
-index a9a2625..cc9c683 100644
---- a/jinja2/loaders.py
-+++ b/jinja2/loaders.py
-@@ -349,7 +349,7 @@ def get_source(self, environment, template):
-     def load(self, environment, name, globals=None):
-         loader, local_name = self.get_loader(name)
-         try:
--            return loader.load(environment, local_name)
-+            return loader.load(environment, local_name, globals)
-         except TemplateNotFound:
-             # re-raise the exception with the correct fileame here.
-             # (the one that includes the prefix)
--- 
-1.8.1.6
-

Copied: python-jinja/repos/community-any/Fix-PrefixLoader-does-not-pass-globals-to-load.patch (from rev 95310, python-jinja/trunk/Fix-PrefixLoader-does-not-pass-globals-to-load.patch)
===================================================================
--- Fix-PrefixLoader-does-not-pass-globals-to-load.patch	                        (rev 0)
+++ Fix-PrefixLoader-does-not-pass-globals-to-load.patch	2013-08-09 08:27:13 UTC (rev 95311)
@@ -0,0 +1,26 @@
+From 478983594423dcdb85e26ea7a02b8d1d72215db6 Mon Sep 17 00:00:00 2001
+From: Morris Jobke <morris.jobke at gmail.com>
+Date: Mon, 27 May 2013 00:54:52 +0300
+Subject: [PATCH] Fix "PrefixLoader does not pass globals to load"
+
+Fix mitsuhiko/jinja2#225
+---
+ jinja2/loaders.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/jinja2/loaders.py b/jinja2/loaders.py
+index a9a2625..cc9c683 100644
+--- a/jinja2/loaders.py
++++ b/jinja2/loaders.py
+@@ -349,7 +349,7 @@ def get_source(self, environment, template):
+     def load(self, environment, name, globals=None):
+         loader, local_name = self.get_loader(name)
+         try:
+-            return loader.load(environment, local_name)
++            return loader.load(environment, local_name, globals)
+         except TemplateNotFound:
+             # re-raise the exception with the correct fileame here.
+             # (the one that includes the prefix)
+-- 
+1.8.1.6
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-09 08:27:02 UTC (rev 95310)
+++ PKGBUILD	2013-08-09 08:27:13 UTC (rev 95311)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Peter Baldwin <bald_pete at hotmail.com>
-
-pkgname=('python-jinja' 'python2-jinja')
-pkgver=2.7
-pkgrel=2
-pkgdesc="A simple pythonic template language written in Python"
-arch=('any')
-url="http://jinja.pocoo.org/"
-license=('BSD')
-makedepends=('python-distribute' 'python2-distribute' 'python-markupsafe'
-             'python2-markupsafe')
-source=(http://pypi.python.org/packages/source/J/Jinja2/Jinja2-$pkgver.tar.gz
-        Fix-PrefixLoader-does-not-pass-globals-to-load.patch)
-sha256sums=('474f1518d189ae7e318b139fecc1d30b943f124448cfa0f09582ca23e069fa4d'
-            '939f61f022a61661bb65e36eb53dd3482cbdb08ea8098c439f7c1aa7f2810b8f')
-
-prepare() {
-  cd "$srcdir/Jinja2-$pkgver"
-
-  # https://github.com/mitsuhiko/jinja2/issues/225
-  patch -Np1 -i "$srcdir/Fix-PrefixLoader-does-not-pass-globals-to-load.patch"
-}
-
-build() {
-  cd "$srcdir"
-
-  rm -rf python{2,3}-build
-  for builddir in python{2,3}-build; do
-    cp -r Jinja2-$pkgver $builddir
-    pushd $builddir
-    ${builddir%-build} setup.py build
-    popd
-  done
-}
-
-package_python-jinja() {
-  depends=('python-distribute' 'python-markupsafe')
-
-  cd "$srcdir/python3-build"
-
-  python3 setup.py install --root="$pkgdir" -O1
-
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_python2-jinja() {
-  depends=('python2-distribute' 'python2-markupsafe')
-
-  cd "$srcdir/python2-build"
-
-  python2 setup.py install --root="$pkgdir" -O1
-
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: python-jinja/repos/community-any/PKGBUILD (from rev 95310, python-jinja/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-08-09 08:27:13 UTC (rev 95311)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Peter Baldwin <bald_pete at hotmail.com>
+
+pkgname=('python-jinja' 'python2-jinja')
+pkgver=2.7.1
+pkgrel=1
+pkgdesc="A simple pythonic template language written in Python"
+arch=('any')
+url="http://jinja.pocoo.org/"
+license=('BSD')
+makedepends=('python-distribute' 'python2-distribute' 'python-markupsafe'
+             'python2-markupsafe')
+source=(http://pypi.python.org/packages/source/J/Jinja2/Jinja2-$pkgver.tar.gz
+        Fix-PrefixLoader-does-not-pass-globals-to-load.patch)
+sha256sums=('5cc0a087a81dca1c08368482fb7a92fe2bdd8cfbb22bc0fccfe6c85affb04c8b'
+            '939f61f022a61661bb65e36eb53dd3482cbdb08ea8098c439f7c1aa7f2810b8f')
+
+prepare() {
+  cd "$srcdir/Jinja2-$pkgver"
+
+  # https://github.com/mitsuhiko/jinja2/issues/225
+  patch -Np1 -i "$srcdir/Fix-PrefixLoader-does-not-pass-globals-to-load.patch"
+}
+
+build() {
+  cd "$srcdir"
+
+  rm -rf python{2,3}-build
+  for builddir in python{2,3}-build; do
+    cp -r Jinja2-$pkgver $builddir
+    pushd $builddir
+    ${builddir%-build} setup.py build
+    popd
+  done
+}
+
+package_python-jinja() {
+  depends=('python-distribute' 'python-markupsafe')
+
+  cd "$srcdir/python3-build"
+
+  python3 setup.py install --root="$pkgdir" -O1
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_python2-jinja() {
+  depends=('python2-distribute' 'python2-markupsafe')
+
+  cd "$srcdir/python2-build"
+
+  python2 setup.py install --root="$pkgdir" -O1
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:




More information about the arch-commits mailing list