From c51532072021553a2f13f0a6fb33b816716c375d Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Tue, 11 Dec 2012 18:33:29 +0000
Subject: subversion: remove "dynamic lookup" warnings

---
 modules/subversion/manifests/init.pp          | 2 +-
 modules/subversion/templates/ciabot_svn.sh    | 4 ++--
 modules/subversion/templates/hook_sendmail.pl | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/subversion/manifests/init.pp b/modules/subversion/manifests/init.pp
index 01b06a62..54dd776f 100644
--- a/modules/subversion/manifests/init.pp
+++ b/modules/subversion/manifests/init.pp
@@ -65,7 +65,7 @@ class subversion {
         #    - openldap , like named
 
         define syntax_check($regexp_ext,$check_cmd) {
-            file { "$local_dir/pre-commit.d/$name":
+            file { "${subversion::server::local_dir}/pre-commit.d/$name":
                 mode    => '0755',
                 content => template('subversion/syntax_check.sh')
             }
diff --git a/modules/subversion/templates/ciabot_svn.sh b/modules/subversion/templates/ciabot_svn.sh
index 63aa77a8..9e1437cf 100755
--- a/modules/subversion/templates/ciabot_svn.sh
+++ b/modules/subversion/templates/ciabot_svn.sh
@@ -65,7 +65,7 @@
 #
 project_name="Mageia"
 module_name="<%= cia_module %>"
-return_address="root@<%= domain %>"
+return_address="root@<%= @domain %>"
 ignore_author="<%= cia_ignore_author %>"
 
 # System
@@ -91,7 +91,7 @@ for file in `svnlook changed -r "$REV" "$REPOS" | cut -c 3- | sed 's/\&/\&amp;/g
     files="$files<file>$file</file>"
 done
 
-url="http://svnweb.<%= domain%>/${REPOS/\/svn\//}?view=revision&amp;revision=$REV"
+url="http://svnweb.<%= @domain%>/${REPOS/\/svn\//}?view=revision&amp;revision=$REV"
 
 # Send an email with the final XML message
 (cat <<EOF
diff --git a/modules/subversion/templates/hook_sendmail.pl b/modules/subversion/templates/hook_sendmail.pl
index aab1db5a..286678be 100644
--- a/modules/subversion/templates/hook_sendmail.pl
+++ b/modules/subversion/templates/hook_sendmail.pl
@@ -7,7 +7,7 @@
   alternative: HTML::ColorDiff
   with-diff: 1
   max_diff_length: 20000
-  from: root@<%= domain %>
+  from: root@<%= @domain %>
   to:
 <%- commit_mail.each do |mail|  -%>
     - <%= mail %>
@@ -19,6 +19,6 @@
   alternative: HTML::ColorDiff
   with-diff: 1
   max_diff_length: 20000
-  from: root@<%= domain %>
+  from: root@<%= @domain %>
   to: <%= i18n_mail %>
 <%- end -%>
-- 
cgit v1.2.1