[maven-debian-helper] 01/02: Bug#820163: mh_resolve_dependencies exception when run with --non-interactive

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository maven-debian-helper.

commit fc2229317775a6f2bc91a29340e70b1cd62110eb
Author: tony mancill <tmancill at debian.org>
Date:   Mon Jul 25 21:04:53 2016 -0700

    Bug#820163: mh_resolve_dependencies exception when run with --non-interactive
    
    Apply patch provided by Christopher Hoskin <christopher.hoskin at gmail.com>.
---
 .../org/debian/maven/packager/util/IgnoreDependencyQuestions.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IgnoreDependencyQuestions.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IgnoreDependencyQuestions.java
index e061a8d..33ab512 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IgnoreDependencyQuestions.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IgnoreDependencyQuestions.java
@@ -163,9 +163,12 @@ public class IgnoreDependencyQuestions {
     }
 
     private boolean askIgnoreDependency(String sourcePomLoc, Dependency dependency, String message, boolean defaultToIgnore) {
-        if (!interactive || notIgnoredDependencies.contains(dependency)) {
+        if (notIgnoredDependencies.contains(dependency)) {
             return false;
         }
+        if (!interactive) {
+            return defaultToIgnore;
+        }
         String question = "\n" + "In " + sourcePomLoc + ": " + message + "  " + dependency;
         boolean ignore = new YesNoQuestion(question, defaultToIgnore).ask();
         if (!ignore) {
@@ -230,4 +233,4 @@ public class IgnoreDependencyQuestions {
         return "";
     }
 }
- 
\ No newline at end of file
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git