You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by xa...@apache.org on 2008/03/25 16:32:42 UTC
svn commit: r640862 -
/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
Author: xavier
Date: Tue Mar 25 08:32:37 2008
New Revision: 640862
URL: http://svn.apache.org/viewvc?rev=640862&view=rev
Log:
fix bug introduced in attempt to fix IVY-773
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java?rev=640862&r1=640861&r2=640862&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java Tue Mar 25 08:32:37 2008
@@ -371,7 +371,7 @@
if (!getSettings().getVersionMatcher().accept(systemMrid, systemMd)) {
throw new UnresolvedDependencyException(
"\t" + getName() + ": unacceptable revision => was="
- + systemMd.getModuleRevisionId().getRevision() + " required="
+ + systemMd.getResolvedModuleRevisionId().getRevision() + " required="
+ systemMrid.getRevision());
}
}
@@ -402,7 +402,8 @@
// attributes that were not included in the dependency constraint
ModuleRevisionId resolvedMrid = systemMd.getResolvedModuleRevisionId();
if (resolvedMrid.getRevision() == null
- || resolvedMrid.getRevision().length() == 0) {
+ || resolvedMrid.getRevision().length() == 0
+ || resolvedMrid.getRevision().startsWith("working@")) {
if (!isDynamic) {
resolvedMrid = ModuleRevisionId.newInstance(
resolvedMrid, dependencyConstraint.getRevision());