Use @ when accessing variables in templates

Access without the @ symbol is the older method and is discouraged.

This is the fifth batch of files.

7 files changed, 12 insertions, 12 deletions

diff --git a/modules/apache/templates/django.wsgi b/modules/apache/templates/django.wsgi
index 2188e1e7..abbfecc5 100644
--- a/modules/apache/templates/django.wsgi
+++ b/modules/apache/templates/django.wsgi
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 import os, sys
-<%- for m in module_path -%>
+<%- for m in @module_path -%>
 path = '<%= m %>'
 if path not in sys.path:
     sys.path.append(path)
diff --git a/modules/auto_installation/templates/default b/modules/auto_installation/templates/default
index 18f9c8e1..50918e14 100644
--- a/modules/auto_installation/templates/default
+++ b/modules/auto_installation/templates/default
@@ -10,6 +10,6 @@ LABEL local
         MENU LABEL Local
         localboot 0
 
-<% for m in menu_entries %>
+<% for m in @menu_entries %>
 INCLUDE pxelinux.cfg/m/<%= m %>
 <% end %>
diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf
index aadc824c..0bd30acb 100644
--- a/modules/buildsystem/templates/iurt.conf
+++ b/modules/buildsystem/templates/iurt.conf
@@ -21,14 +21,14 @@
  sendmail => 0,
  log_size_limit => '600M',
  build_timeout => {
-<%- build_timeout.keys.sort.each{|package| -%>
-   '<%= package %>' => <%= (build_timeout[package].to_f * scope.lookupvar('buildsystem::var::iurt::timeout_multiplier').to_f).to_i %>,
+<%- @build_timeout.keys.sort.each{|package| -%>
+   '<%= package %>' => <%= (@build_timeout[package].to_f * scope.lookupvar('buildsystem::var::iurt::timeout_multiplier').to_f).to_i %>,
 <%-
 } -%>
  },
  use_netns => {
    'default' => 1,
-<%- allow_network_access.sort.each{|package| -%>
+<%- @allow_network_access.sort.each{|package| -%>
    '<%= package %>' => 0,
 <%-
 } -%>
diff --git a/modules/puppet/templates/db_config.erb b/modules/puppet/templates/db_config.erb
index 1b906274..cbcd42b0 100644
--- a/modules/puppet/templates/db_config.erb
+++ b/modules/puppet/templates/db_config.erb
@@ -1,4 +1,4 @@
-<%- if database == 'sqlite3' -%>
+<%- if @database == 'sqlite3' -%>
     dbadapter = sqlite3
     dblocation = /var/lib/puppet/storeconfigs.db
 <%- else -%>
diff --git a/modules/subversion/templates/hook_extract.pl b/modules/subversion/templates/hook_extract.pl
index bf1fc545..12be78b8 100644
--- a/modules/subversion/templates/hook_extract.pl
+++ b/modules/subversion/templates/hook_extract.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -MSVN::Notify::Config=$0
 --- #YAML:1.0
-<%- extract_dir.each do |src,dest| -%>
+<%- @extract_dir.each do |src,dest| -%>
 '<%= src %>':
   PATH: "/usr/bin:/usr/local/bin"
   handler: Mirror
diff --git a/modules/sympa/templates/list.xml b/modules/sympa/templates/list.xml
index 74e4f07f..b5e8b4c2 100644
--- a/modules/sympa/templates/list.xml
+++ b/modules/sympa/templates/list.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" ?>
 <list>
-        <listname><%= name %></listname>
+        <listname><%= @name %></listname>
         <type>discussion_list</type>
-        <subject><%= subject %></subject>
+        <subject><%= @subject %></subject>
         <description/>
         <status>open</status>
-        <language><%= language %></language>
+        <language><%= @language %></language>
         <owner_include multiple="1">
             <source>mga-sysadmin</source>
         </owner_include>
         <editor_include multiple="1">
             <source>mga-ml_moderators</source>
         </editor_include>
-        <topic><%= topics %></topic>
+        <topic><%= @topics %></topic>
 </list>
diff --git a/modules/sympa/templates/scenari/sender.restricted b/modules/sympa/templates/scenari/sender.restricted
index 66139e6c..2c82268a 100644
--- a/modules/sympa/templates/scenari/sender.restricted
+++ b/modules/sympa/templates/scenari/sender.restricted
@@ -8,7 +8,7 @@ search(<%= @ldap_group %>.ldap)  smtp,md5,smime  -> do_it
 equal([sender], '<%= e %>') smtp,md5,smime -> do_it
   <%- end -%>
 <%- end -%>
-<%- if allow_subscriber -%>
+<%- if @allow_subscriber -%>
 equal([sender], 'sysadmin@group.mageia.org') smtp,smime,md5 -> do_it
 match([sender], /@mageia\.org$/)     smtp,smime,md5    -> do_it
 is_subscriber([listname],[sender])   smtp,smime,md5    -> do_it