Author: maartenc
Date: Sun Jun 28 22:41:09 2009
New Revision: 789166
URL: http://svn.apache.org/viewvc?rev=789166&view=rev
Log:
FIX: [originalname] not expanded during retrieve when module descriptor
contains extra attributes (IVY-1096)
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java?rev=789166&r1=789165&r2=789166&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
Sun Jun 28 22:41:09 2009
@@ -304,8 +304,9 @@
continue; // skip this artifact, the filter didn't accept
it!
}
- String destFileName = IvyPatternHelper.substitute(
- destPattern, artifact.getArtifact(),
conf);
+ String destFileName = IvyPatternHelper.substitute(destPattern,
+ artifact.getArtifact().getModuleRevisionId(),
artifact.getArtifact(),
+ conf, artifact.getArtifactOrigin());
Set dest = (Set) artifactsToCopy.get(artifact);
if (dest == null) {
