fix rendering resolv.conf if no 'options' are provided

this makes some changes to the cc_resolv_conf to make its
generate_resolv_conf method more easily callable (for future test).

Also sets it up so that 'options' is always defined when the template
is rendered.

LP: #1328953

1 files changed, 1 insertions, 1 deletions

diff --git a/templates/resolv.conf.tmpl b/templates/resolv.conf.tmpl
index 6f908f30..1300156c 100644
--- a/templates/resolv.conf.tmpl
+++ b/templates/resolv.conf.tmpl
@@ -21,7 +21,7 @@ domain {{domain}}
 
 sortlist {% for sort in sortlist %}{{sort}} {% endfor %}
 {% endif %}
-{% if options is defined or flags is defined %}
+{% if options or flags %}
 
 options {% for flag in flags %}{{flag}} {% endfor %}
 {% for key, value in options.iteritems() -%}