From 34933b03ece57874f553c460f419a77633ce86d9 Mon Sep 17 00:00:00 2001 From: "Jesse N. Glick" Date: Tue, 28 Oct 2008 21:08:05 +0000 Subject: [PATCH] Suppress displaying the stderr prompt for storepass/keypass when we in fact are passing it on stdin. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@708670 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/AbstractJarSignerTask.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java index 97f3c8833..aa9497dc1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java @@ -24,10 +24,12 @@ import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; +import org.apache.tools.ant.filters.LineContainsRegExp; import org.apache.tools.ant.types.Environment; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.RedirectorElement; +import org.apache.tools.ant.types.RegularExpression; import org.apache.tools.ant.util.JavaEnvUtils; /** @@ -244,6 +246,14 @@ public abstract class AbstractJarSignerTask extends Task { } result.setInputString(input.toString()); result.setLogInputString(false); + // Try to avoid showing password prompts on log output, as they would be confusing. + LineContainsRegExp filter = new LineContainsRegExp(); + RegularExpression rx = new RegularExpression(); + // XXX only handles English locale, not ja or zh_CN + rx.setPattern("^(Enter Passphrase for keystore: |Enter key password for .+: )$"); + filter.addConfiguredRegexp(rx); + filter.setNegate(true); + result.createErrorFilterChain().addLineContainsRegExp(filter); } return result; }