diff options
author | 2013-09-09 03:30:46 +0200 | |
---|---|---|
committer | 2013-09-09 03:30:46 +0200 | |
commit | 60e6913375948bc17bc441d18cd57f160a48ac78 (patch) | |
tree | 1f6160bb0d73b6dcb1b047794a6f82a810cf09ad | |
parent | Update mozilla-sync-server-storage to the last released version (diff) | |
download | klondike-60e6913375948bc17bc441d18cd57f160a48ac78.tar.gz klondike-60e6913375948bc17bc441d18cd57f160a48ac78.tar.bz2 klondike-60e6913375948bc17bc441d18cd57f160a48ac78.zip |
Generate mako python files in tmp instead of the templates directory which is read only
Package-Manager: portage-2.1.12.2
-rw-r--r-- | www-misc/mozilla-sync-server-reg/ChangeLog | 9 | ||||
-rw-r--r-- | www-misc/mozilla-sync-server-reg/Manifest | 5 | ||||
-rw-r--r-- | www-misc/mozilla-sync-server-reg/files/mozilla-sync-server-reg-1.2.6_generate_templates_in_tmp.patch | 27 | ||||
-rw-r--r-- | www-misc/mozilla-sync-server-reg/mozilla-sync-server-reg-1.2.6-r1.ebuild (renamed from www-misc/mozilla-sync-server-reg/mozilla-sync-server-reg-1.2.6.ebuild) | 2 |
4 files changed, 41 insertions, 2 deletions
diff --git a/www-misc/mozilla-sync-server-reg/ChangeLog b/www-misc/mozilla-sync-server-reg/ChangeLog index 882d63f..cd0ef7f 100644 --- a/www-misc/mozilla-sync-server-reg/ChangeLog +++ b/www-misc/mozilla-sync-server-reg/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*mozilla-sync-server-reg-1.2.6-r1 (09 Sep 2013) + + 09 Sep 2013; Francisco Blas Izquierdo Riera (klondike) + -mozilla-sync-server-reg-1.2.6.ebuild, + +mozilla-sync-server-reg-1.2.6-r1.ebuild, + +files/mozilla-sync-server-reg-1.2.6_generate_templates_in_tmp.patch: + Generate mako python files in tmp instead of the templates directory which is + read only + *mozilla-sync-server-reg-1.2.6 (08 Sep 2013) 08 Sep 2013; Francisco Blas Izquierdo Riera (klondike) diff --git a/www-misc/mozilla-sync-server-reg/Manifest b/www-misc/mozilla-sync-server-reg/Manifest index 561392c..a1f6e8a 100644 --- a/www-misc/mozilla-sync-server-reg/Manifest +++ b/www-misc/mozilla-sync-server-reg/Manifest @@ -1,3 +1,4 @@ -EBUILD mozilla-sync-server-reg-1.2.6.ebuild 1226 SHA256 1a3f2352975a463493f57d7369293d6c99d61ce52d445085f9a93b613e316e16 SHA512 2c898e8c13402f52e17deacb6e926d8257ff0767e1d16ba949cd3fc36406c809b53b434953bec19c507f49dcad34063a334258057376a729faff45fd130d0293 WHIRLPOOL 7367320f315f1ce395ff9c41327d8f0c2db1082788a09c6d2311529fda3183f15f78b978fec7ce5336d11b64090241e575d848926575f3ad1820d34e1ba9b242 -MISC ChangeLog 339 SHA256 3281643cf9327f85d67b6482874e99d9d215be57446bd7488d2892e3852c07ff SHA512 fe9c981a80131459764580a00fefb7e5cd809b2ff34fc8e2913aa47ae6e35a691fa58784ba49138d2315d4226a9598b209ade66ae7d21b5ee66e63ccfb46989d WHIRLPOOL 5d0c9799749cddb26a5dd4bf4e7077fc72e501fdd1f38b0815828b98bba760cb72dcaf86adca0134279d12bcac03edb4f9ce0d39bcf895b854338ca607461bef +AUX mozilla-sync-server-reg-1.2.6_generate_templates_in_tmp.patch 990 SHA256 4dce7e170a49bddb16a545e0de7ec25c209a8cfb7d33fc49b8319362b631bc11 SHA512 b23ed9087f2e035e275002354c8df249d83a39ce852da5f3ca36b25bf2f6e5fcd174390e400c606e4d3ce6640ba406f0fa163d922cb434889d238df1cd787468 WHIRLPOOL 16c19a56f7c9dd4ac7bb09ab3109594de4a0d0d4570fcaa7cc32adc5e60cd4de2c20328a917271690a82af142a5f367fbda46d6cc5d81b02d71d2db2c12af4a2 +EBUILD mozilla-sync-server-reg-1.2.6-r1.ebuild 1288 SHA256 9daefea3fdee00e2c02f835c43076e4654c7a6c3abbb9da6775b00bcbc879f6f SHA512 7589a82275e9a626337b0abd88b179894980b8a962007d145b1076beda2258091c320e8a86faf84ee3e5edf7d346086ba09586f66e3b4d196d8fb2b4706a6f7e WHIRLPOOL e8d60f47888408d7f65c156d9e2e5075fb0eec7ab8a05aa778791432f3c9968153f58e95fc26e5bf97a9124bd97fe10bf6f00245a024f07a79f2661a6eb808c5 +MISC ChangeLog 695 SHA256 0398c3fc87a0a7d456119abf996a2bdec4788e6c671f1ec980355923a18cb84c SHA512 d5956588cbe10de15790116d54d06efc069514d9c9c949497a97601004bf83c6a4c20b346753e2cfeeb4a832c95bd406301dea6be14ff568c304c3f37d425251 WHIRLPOOL bdc5022b43ebf8955bbfa73dd077bcaaf51381cdd19d4af8982259f3b297744a0ba1d2e7a434d18149da2c5719bca06581ba95279f3a3ee6141882f760a5c20b MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186 diff --git a/www-misc/mozilla-sync-server-reg/files/mozilla-sync-server-reg-1.2.6_generate_templates_in_tmp.patch b/www-misc/mozilla-sync-server-reg/files/mozilla-sync-server-reg-1.2.6_generate_templates_in_tmp.patch new file mode 100644 index 0000000..78e8ecc --- /dev/null +++ b/www-misc/mozilla-sync-server-reg/files/mozilla-sync-server-reg-1.2.6_generate_templates_in_tmp.patch @@ -0,0 +1,27 @@ +diff -ur mozilla-sync-server-reg.orig/syncreg/util.py mozilla-sync-server-reg/syncreg/util.py +--- mozilla-sync-server-reg.orig/syncreg/util.py 2013-09-09 03:11:28.346826371 +0200 ++++ mozilla-sync-server-reg/syncreg/util.py 2013-09-09 03:23:31.707855355 +0200 +@@ -35,10 +35,14 @@ + # ***** END LICENSE BLOCK ***** + import os + from mako.lookup import TemplateLookup ++from tempfile import mkdtemp ++import atexit ++from shutil import rmtree + + _TPL_DIR = os.path.join(os.path.dirname(__file__), 'templates') ++_GEN_TPL_DIR = mkdtemp() + _lookup = TemplateLookup(directories=[_TPL_DIR], +- module_directory=_TPL_DIR) # XXX defined in prod ++ module_directory=_GEN_TPL_DIR) # XXX defined in prod, this avoids permission issues + + + def render_mako(template, **data): +@@ -53,3 +57,7 @@ + """ + template = _lookup.get_template(template) + return template.render(**data) ++ ++@atexit.register ++def delete_tpl_temp(): ++ rmtree(_GEN_TPL_DIR,True) diff --git a/www-misc/mozilla-sync-server-reg/mozilla-sync-server-reg-1.2.6.ebuild b/www-misc/mozilla-sync-server-reg/mozilla-sync-server-reg-1.2.6-r1.ebuild index f6eb2c9..099db23 100644 --- a/www-misc/mozilla-sync-server-reg/mozilla-sync-server-reg-1.2.6.ebuild +++ b/www-misc/mozilla-sync-server-reg/mozilla-sync-server-reg-1.2.6-r1.ebuild @@ -44,6 +44,8 @@ DEPEND="${RDEPEND} test? ( dev-python/nose[${PYTHON_USEDEP}] ) dev-python/setuptools[${PYTHON_USEDEP}]" +PATCHES=( ${FILESDIR}/${P}_generate_templates_in_tmp.patch ) + python_test() { nosetests || die "Tests fail with ${EPYTHON}" } |