[elbe-devel] [PATCH v2 24/24] elbeproject: dont reimplement write_pack_template

[Torben Hohn]

On Thu, Feb 08, 2018 at 02:17:10PM +0100, Manuel Traut wrote:
> Signed-off-by: Manuel Traut <manut at linutronix.de>

Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>

> ---
>  elbepack/elbeproject.py | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
> index 01fac01a..1434c5e6 100644
> --- a/elbepack/elbeproject.py
> +++ b/elbepack/elbeproject.py
> @@ -44,7 +44,7 @@ from elbepack.repomanager import ProjectRepo
>  from elbepack.config import cfg
>  from elbepack.pkgutils import extract_pkg
>  from elbepack.directories import (mako_template_dir, pack_dir)

this line needs to go again ^^^^
followup patch

> -from elbepack.templates import template
> +from elbepack.templates import template, write_pack_template
>  
>  
>  class IncompatibleArchitectureException(Exception):
> @@ -95,17 +95,16 @@ def gen_sdk_scripts(triplet, prj_name, prj_version, builddir, sdkpath):
>                    'sdk_title': 'ELBE %s' % prj_name,
>                    'sdk_version': prj_version,
>                  }
> -    t = os.path.join(mako_template_dir, 'toolchain-shar-extract.sh.mako')
>      sdkname = 'setup-elbe-sdk-%s-%s-%s.sh' % (triplet, prj_name, prj_version)
> -    with open(os.path.join(builddir, sdkname), 'w') as f:
> -        f.write(template(t, sdkvalues))
> -
> -    t = os.path.join(mako_template_dir, 'environment-setup-elbe.mako')
> +    write_pack_template(os.path.join(builddir, sdkname),
> +                        'toolchain-shar-extract.sh.mako',
> +                        sdkvalues)
>      envname = 'environment-setup-elbe-%s-%s-%s' % (triplet,
>                                                     prj_name,
>                                                     prj_version)
> -    with open(os.path.join(sdkpath, envname), 'w') as f:
> -        f.write(template(t, sdkvalues))
> +    write_pack_template(os.path.join(sdkpath, envname),
> +                        'environment-setup-elbe.mako',
> +                        sdkvalues)
>  
>      return sdkname
>  
> -- 
> 2.15.1
> 

-- 
Mit freundlichen Grüßen
Torben Hohn

Linutronix GmbH

Standort: Bremen

Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99

Firmensitz / Registered Office: D-88690 Uhldingen, Bahnhofstr. 3
Registergericht / Local District Court: Amtsgericht Freiburg i. Br.; HRB
Nr. / Trade register no.: 700 806

Geschäftsführer / Managing Directors: Heinz Egger, Thomas Gleixner

Eine Bitte von uns: Sollten Sie diese E-Mail irrtümlich erhalten haben,
benachrichtigen Sie uns in diesem Falle bitte sobald wie es Ihnen
möglich ist, durch Antwort-Mail. Vielen Dank!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.linutronix.de/pipermail/elbe-devel/attachments/20180208/42ddd4a8/attachment.sig>