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 2009/09/22 23:36:28 UTC
svn commit: r817851 - in
/ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy: Main.java
plugins/resolver/RepositoryResolver.java
Author: maartenc
Date: Tue Sep 22 21:36:24 2009
New Revision: 817851
URL: http://svn.apache.org/viewvc?rev=817851&view=rev
Log:
Fixed old merge-problem.
Modified:
ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/Main.java
ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
Modified: ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/Main.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/Main.java?rev=817851&r1=817850&r2=817851&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/Main.java (original)
+++ ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/Main.java Tue Sep 22 21:36:24 2009
@@ -267,9 +267,6 @@
if (line.hasOption("refresh")) {
resolveOptions.setRefresh(true);
}
- if (line.hasOption("refresh")) {
- resolveOptions.setRefresh(true);
- }
ResolveReport report = ivy.resolve(ivyfile.toURI().toURL(), resolveOptions);
if (report.hasError()) {
System.exit(1);
Modified: ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java?rev=817851&r1=817850&r2=817851&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java (original)
+++ ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java Tue Sep 22 21:36:24 2009
@@ -226,12 +226,6 @@
repository.put(artifact, src, dest, overwrite);
for (int i = 0; i < checksums.length; i++) {
- if (!ChecksumHelper.isKnownAlgorithm(checksums[i])) {
- throw new IllegalArgumentException("Unknown checksum algorithm: " + checksums[i]); }
- }
-
- repository.put(artifact, src, dest, overwrite);
- for (int i = 0; i < checksums.length; i++) {
putChecksum(artifact, src, dest, overwrite, checksums[i]);
}
}