diff options
| author | Dan Fandrich <danf@mageia.org> | 2026-02-21 20:55:36 -0800 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2026-02-21 21:10:56 -0800 |
| commit | 394f128c52caae23a9024c55cbef043bf7e080ea (patch) | |
| tree | 0d45a4af40cfa5e3a1da8a3f1ea7ffd502bec580 /modules/subversion | |
| parent | 5b23841245eea3a2ba86dd0544668b5e00eb5b4b (diff) | |
| download | puppet-394f128c52caae23a9024c55cbef043bf7e080ea.tar puppet-394f128c52caae23a9024c55cbef043bf7e080ea.tar.gz puppet-394f128c52caae23a9024c55cbef043bf7e080ea.tar.bz2 puppet-394f128c52caae23a9024c55cbef043bf7e080ea.tar.xz puppet-394f128c52caae23a9024c55cbef043bf7e080ea.zip | |
Use @ when accessing variables in templates
Access without the @ symbol is the older method and is discouraged.
This is the fourth batch of files.
Diffstat (limited to 'modules/subversion')
| -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/restricted_to_user | 4 | ||||
| -rw-r--r-- | modules/subversion/templates/syntax_check.sh | 6 | ||||
| -rw-r--r-- | modules/subversion/templates/xinetd | 2 |
5 files changed, 9 insertions, 9 deletions
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 cf3be6a4..a5870c72 100644 --- a/modules/subversion/templates/hook_sendmail.pl +++ b/modules/subversion/templates/hook_sendmail.pl @@ -16,7 +16,7 @@ <%- commit_mail.each do |mail| -%> - <%= mail %> <%- end -%> -<%- if i18n_mail != '' -%> +<%- if @i18n_mail != '' -%> '.*\.pot$': PATH: "/usr/bin:/usr/local/bin" handler: Alternative @@ -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/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 } |