svn commit: r694789 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/Main.java

[ma...@apache.org]

Author: maartenc
Date: Fri Sep 12 12:58:45 2008
New Revision: 694789

URL: http://svn.apache.org/viewvc?rev=694789&view=rev
Log:
FIX: Ivy stand-alone ignores -cache argument (IVY-901) (thanks to Chris)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/Main.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=694789&r1=694788&r2=694789&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Sep 12 12:58:45 2008
@@ -111,6 +111,7 @@
 - IMPROVEMENT: Add a memory cache for the module descriptor that are parsed from the cache (IVY-883)
 - IMPROVEMENT: Improve performance (IVY-872)
 
+- FIX: Ivy stand-alone ignores -cache argument (IVY-901) (thanks to Chris)
 - FIX: ivy.cache.dir.${settingsRef} is set to default instead of the defaultCacheDir from the ivysettings.xml after ivy:resolve (IVY-898)
 - FIX: Ivy ibiblio resolver chokes on variables while checking descriptor consistency (IVY-818)
 - FIX: Enable consistent support of the configuration negation operator (IVY-894) (thanks to Patrick Woodworth)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/Main.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/Main.java?rev=694789&r1=694788&r2=694789&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/Main.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/Main.java Fri Sep 12 12:58:45 2008
@@ -185,6 +185,12 @@
 
             File cache = new File(settings.substitute(line.getOptionValue("cache", settings
                     .getDefaultCache().getAbsolutePath())));
+
+            if (line.hasOption("cache")) {
+                //override default cache path with user supplied cache path
+                settings.setDefaultCache(cache);
+            }
+
             if (!cache.exists()) {
                 cache.mkdirs();
             } else if (!cache.isDirectory()) {