diff options
Diffstat (limited to 'modules/subversion/templates')
-rw-r--r-- | modules/subversion/templates/hook_extract.pl | 4 | ||||
-rw-r--r-- | modules/subversion/templates/hook_irker | 2 | ||||
-rw-r--r-- | modules/subversion/templates/hook_sendmail.pl | 4 | ||||
-rw-r--r-- | modules/subversion/templates/irker.conf | 2 | ||||
-rw-r--r-- | modules/subversion/templates/restricted_to_user | 4 | ||||
-rw-r--r-- | modules/subversion/templates/syntax_check.sh | 6 | ||||
-rw-r--r-- | modules/subversion/templates/xinetd | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/modules/subversion/templates/hook_extract.pl b/modules/subversion/templates/hook_extract.pl index bf1fc545..2260b014 100644 --- a/modules/subversion/templates/hook_extract.pl +++ b/modules/subversion/templates/hook_extract.pl @@ -1,9 +1,9 @@ #!/usr/bin/perl -MSVN::Notify::Config=$0 --- #YAML:1.0 <%- extract_dir.each do |src,dest| -%> -'<%= src %>': +'<%= @src %>': PATH: "/usr/bin:/usr/local/bin" handler: Mirror svn-binary: /usr/bin/svn - to: <%= dest %> + to: <%= @dest %> <%- end -%> diff --git a/modules/subversion/templates/hook_irker b/modules/subversion/templates/hook_irker index 8fd7a874..8f6ea431 100644 --- a/modules/subversion/templates/hook_irker +++ b/modules/subversion/templates/hook_irker @@ -1,4 +1,4 @@ #!/bin/sh REPO=$1 REV=$2 -<%= irkerhook_path %> --repository=$REPO $REV +<%= @irkerhook_path %> --repository=$REPO $REV diff --git a/modules/subversion/templates/hook_sendmail.pl b/modules/subversion/templates/hook_sendmail.pl index 81b786d2..9f0b61a4 100644 --- a/modules/subversion/templates/hook_sendmail.pl +++ b/modules/subversion/templates/hook_sendmail.pl @@ -14,7 +14,7 @@ from: subversion_noreply@ml.<%= @domain %> to: <%- commit_mail.each do |mail| -%> - - <%= mail %> + - <%= @mail %> <%- end -%> <%- if i18n_mail != '' -%> '.*\.pot$': @@ -28,5 +28,5 @@ revision-url: "https://svnweb.mageia.org/packages/?revision=%s&view=revision" subject_cx: 1 from: subversion_noreply@ml.<%= @domain %> - to: <%= i18n_mail %> + to: <%= @i18n_mail %> <%- end -%> diff --git a/modules/subversion/templates/irker.conf b/modules/subversion/templates/irker.conf index d037a120..0b6a8824 100644 --- a/modules/subversion/templates/irker.conf +++ b/modules/subversion/templates/irker.conf @@ -4,4 +4,4 @@ content += key + ' = ' + @irker_conf[key] + "\n" } -%> -<%= content %> +<%= @content %> diff --git a/modules/subversion/templates/restricted_to_user b/modules/subversion/templates/restricted_to_user index 98297627..fcdfa38c 100644 --- a/modules/subversion/templates/restricted_to_user +++ b/modules/subversion/templates/restricted_to_user @@ -5,8 +5,8 @@ TXN="$2" author=$(svnlook author -t "$TXN" "$REP") -if [ "$author" != '<%= restricted_to_user %>' ]; then - echo "this repository is restricted to user <%= restricted_to_user %>" >&2 +if [ "$author" != '<%= @restricted_to_user %>' ]; then + echo "this repository is restricted to user <%= @restricted_to_user %>" >&2 exit 1 fi diff --git a/modules/subversion/templates/syntax_check.sh b/modules/subversion/templates/syntax_check.sh index 3960cdab..76141e54 100644 --- a/modules/subversion/templates/syntax_check.sh +++ b/modules/subversion/templates/syntax_check.sh @@ -6,13 +6,13 @@ export PATH="/bin/:/sbin/:/usr/bin/:/usr/sbin/:/usr/local/bin:/usr/local/sbin/" changed=`svnlook changed -t "$TXN" "$REPOS"` files=`echo $changed | awk '{print $2}'` -if echo $files | grep "<%= regexp_ext %>" +if echo $files | grep "<%= @regexp_ext %>" then - svnlook cat -t "$TXN" "$REPOS" "$files" | <%= check_cmd %> + svnlook cat -t "$TXN" "$REPOS" "$files" | <%= @check_cmd %> if [ $? -ne 0 ] then echo "Syntax error in $files." 1>&2 - echo "Check it with <%= check_cmd %>" 1>&2 + echo "Check it with <%= @check_cmd %>" 1>&2 exit 1 fi fi diff --git a/modules/subversion/templates/xinetd b/modules/subversion/templates/xinetd index 0919ae60..c0eaab2a 100644 --- a/modules/subversion/templates/xinetd +++ b/modules/subversion/templates/xinetd @@ -9,6 +9,6 @@ service svnserve wait = no user = svn server = /usr/bin/svnserve - server_args = -i -r <%= svn_base_path %> + server_args = -i -r <%= @svn_base_path %> flags = IPv6 } |