You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by tr...@apache.org on 2018/01/31 04:16:44 UTC
svn commit: r1822736 [3/3] - in /subversion/branches/swig-py3: ./ build/
build/generator/ build/generator/swig/ build/generator/util/
subversion/bindings/javahl/native/
subversion/bindings/swig/python/libsvn_swig_py/ subversion/include/
subversion/incl...
Modified: subversion/branches/swig-py3/tools/dist/backport.pl
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/tools/dist/backport.pl?rev=1822736&r1=1822735&r2=1822736&view=diff
==============================================================================
--- subversion/branches/swig-py3/tools/dist/backport.pl (original)
+++ subversion/branches/swig-py3/tools/dist/backport.pl Wed Jan 31 04:16:43 2018
@@ -1297,7 +1297,8 @@ sub nominate_main {
# Done!
system "$SVN diff -- $STATUS";
if (prompt "Commit this nomination? ") {
- system "$SVN commit -m '* STATUS: Nominate r$revnums[0].' -- $STATUS";
+ my $header = join ', ', map "r$_", @revnums;
+ system "$SVN commit -m '* STATUS: Nominate $header.' -- $STATUS";
exit $?;
}
elsif (!$had_local_mods or prompt "Revert STATUS (destroying local mods)? ") {
Modified: subversion/branches/swig-py3/tools/examples/ExampleAuthn.java
URL: http://svn.apache.org/viewvc/subversion/branches/swig-py3/tools/examples/ExampleAuthn.java?rev=1822736&r1=1822735&r2=1822736&view=diff
==============================================================================
--- subversion/branches/swig-py3/tools/examples/ExampleAuthn.java (original)
+++ subversion/branches/swig-py3/tools/examples/ExampleAuthn.java Wed Jan 31 04:16:43 2018
@@ -68,8 +68,11 @@ public class ExampleAuthn {
SSLServerCertFailures failures,
SSLServerCertInfo info,
boolean maySave) {
- System.out.println("sslServerTrustPrompt not implemented!");
- return SSLServerTrustResult.acceptTemporarily();
+ System.out.println("sslServerTrustPrompt");
+ System.out.println("(r)eject or (t)emporary?");
+ String s = System.console().readLine();
+ return s.equals("t") ? SSLServerTrustResult.acceptTemporarily()
+ : SSLServerTrustResult.reject();
}
public SSLClientCertResult