You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2008/03/20 23:58:02 UTC
svn commit: r639496 - in /ant/ivy/core/trunk: CHANGES.txt
src/java/org/apache/ivy/ant/IvyAntSettings.java
Author: maartenc
Date: Thu Mar 20 15:57:59 2008
New Revision: 639496
URL: http://svn.apache.org/viewvc?rev=639496&view=rev
Log:
FIX: ivy:settings fails when override is not set to 'true' (IVY-771)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=639496&r1=639495&r2=639496&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Thu Mar 20 15:57:59 2008
@@ -73,6 +73,7 @@
- IMPROVEMENT: Parse description and home page from poms (IVY-767)
- IMPROVEMENT: Smarter determination if an expression is exact or not for RegexpPatternMatcher and GlobPatternMatcher
+- FIX: ivy:settings fails when override is not set to 'true' (IVY-771)
- FIX: NPE when specifying both resolveId and inline in an Ivy:Resolve (IVY-776)
- FIX: repreport task not working against a repository structured by branches (IVY-716)
- FIX: Ivy reports a conflict when the same file is supposed to be retrieved at the same location twice (or more) (IVY-743)
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java?rev=639496&r1=639495&r2=639496&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java Thu Mar 20 15:57:59 2008
@@ -253,7 +253,8 @@
public void execute() throws BuildException {
if (!OVERRIDE_TRUE.equals(override)) {
- if (getProject().getReference(id) != null) {
+ Object otherRef = getProject().getReference(id);
+ if ((otherRef != null) && (otherRef != this)) {
if (OVERRIDE_FALSE.equals(override)) {
verbose("a settings definition is already available for " + id + ": skipping");
return;