diff options
| author | James McCoy <jamessan@debian.org> | 2015-03-07 01:45:57 +0000 |
|---|---|---|
| committer | James McCoy <jamessan@debian.org> | 2015-03-07 01:45:57 +0000 |
| commit | 73530fd14160cf69c4d9a32c189a7ef48956b4f0 (patch) | |
| tree | 052ee7e1c0bdfecc217722de5ae44c8cec29d884 /debian/patches/repos-templates | |
| parent | fb8ac294ab6066dfbeba03dc3fba6e5a18018b70 (diff) | |
Start 1.9.x branch with 1.9.0~beta1
Diffstat (limited to 'debian/patches/repos-templates')
| -rw-r--r-- | debian/patches/repos-templates | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/debian/patches/repos-templates b/debian/patches/repos-templates index 5e7f71a..aa751b0 100644 --- a/debian/patches/repos-templates +++ b/debian/patches/repos-templates @@ -14,7 +14,7 @@ hooks, not just use them in place. "# http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and" NL \ "# http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/" NL -@@ -361,8 +361,11 @@ +@@ -409,8 +409,11 @@ "REPOS=\"$1\"" NL "USER=\"$2\"" NL "" NL @@ -28,7 +28,7 @@ hooks, not just use them in place. "" NL "# All checks passed, so allow the commit." NL "exit 0" NL; -@@ -451,10 +454,13 @@ +@@ -470,10 +473,13 @@ "$SVNLOOK log -t \"$TXN\" \"$REPOS\" | \\" NL " grep \"[a-zA-Z0-9]\" > /dev/null || exit 1" NL "" NL @@ -44,16 +44,16 @@ hooks, not just use them in place. "" NL "# All checks passed, so allow the commit." NL "exit 0" NL; -@@ -775,7 +781,7 @@ +@@ -684,7 +690,7 @@ "REV=\"$2\"" NL "TXN_NAME=\"$3\"" NL NL -"mailer.py commit \"$REPOS\" \"$REV\" /path/to/mailer.conf" NL; +"\"$REPOS\"/hooks/mailer.py commit \"$REPOS\" $REV \"$REPOS\"/mailer.conf" NL; - #undef SCRIPT_NAME - -@@ -838,7 +844,8 @@ + SVN_ERR_W(write_hook_template_file(repos, SCRIPT_NAME, + description, script, pool), +@@ -719,7 +725,8 @@ "USER=\"$2\"" NL "" NL "# Send email to interested parties, let them know a lock was created:" NL @@ -61,9 +61,9 @@ hooks, not just use them in place. +"\"$REPOS\"/hooks/mailer.py lock \\" NL +" \"$REPOS\" \"$USER\" \"$REPOS\"/hooks/mailer.conf" NL; - #undef SCRIPT_NAME - -@@ -899,7 +906,8 @@ + SVN_ERR_W(write_hook_template_file(repos, SCRIPT_NAME, + description, script, pool), +@@ -751,7 +758,8 @@ "USER=\"$2\"" NL "" NL "# Send email to interested parties, let them know a lock was removed:" NL @@ -71,9 +71,9 @@ hooks, not just use them in place. +"\"$REPOS\"/hooks/mailer.py unlock \\" NL +" \"$REPOS\" \"$USER\" \"$REPOS\"/hooks/mailer.conf" NL; - #undef SCRIPT_NAME - -@@ -966,8 +974,8 @@ + SVN_ERR_W(write_hook_template_file(repos, SCRIPT_NAME, + description, script, pool), +@@ -791,8 +799,8 @@ "PROPNAME=\"$4\"" NL "ACTION=\"$5\"" NL "" NL @@ -82,5 +82,5 @@ hooks, not just use them in place. +"\"$REPOS\"/hooks/mailer.py propchange2 \"$REPOS\" $REV \\" NL +" \"$USER\" \"$PROPNAME\" \"$ACTION\" \"$REPOS\"/hooks/mailer.conf" NL; - #undef SCRIPT_NAME - + SVN_ERR_W(write_hook_template_file(repos, SCRIPT_NAME, + description, script, pool), |