← Back to branch summary

~plumgrid-team/charms/trusty/plumgrid-director/trunk

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/templating/jinja.py

  • Committer: bbaqar at plumgrid
  • Date: 2016-04-25 09:14:38 UTC
  • mfrom: (30.1.3 plumgrid-director)
  • Revision ID: bbaqar@plumgrid.com-20160425091438-4hk5s00dydf00jem
Merge: Liberty/Mitaka support

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/templating/jinja.py
18
18
Templating using the python-jinja2 package.
19
19
"""
20
20
import six
21
 
from charmhelpers.fetch import apt_install
 
21
from charmhelpers.fetch import apt_install, apt_update
22
22
try:
23
23
    import jinja2
24
24
except ImportError:
 
25
    apt_update(fatal=True)
25
26
    if six.PY3:
26
 
        apt_install(["python3-jinja2"])
 
27
        apt_install(["python3-jinja2"], fatal=True)
27
28
    else:
28
 
        apt_install(["python-jinja2"])
 
29
        apt_install(["python-jinja2"], fatal=True)
29
30
    import jinja2
30
31
 
31
32