Author: maartenc
Date: Mon Dec 15 13:44:13 2008
New Revision: 726815
URL: http://svn.apache.org/viewvc?rev=726815&view=rev
Log:
FIX: Log levels aren't respected in certain cases using the standalone
functionality (IVY-960) (thanks to Patrick Woodworth) (merged from trunk)
Modified:
ant/ivy/core/branches/2.0.x/ (props changed)
ant/ivy/core/branches/2.0.x/CHANGES.txt
ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/Main.java
Propchange: ant/ivy/core/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 13:44:13 2008
@@ -1,2 +1,2 @@
/ant/ivy/core/branches/2.0.0-rc2:707177-709027
-/ant/ivy/core/trunk:695737,696014-696031,696442,698318-706770,720308-720591
+/ant/ivy/core/trunk:695737,696014-696031,696442,698318-706770,709027-709034,720308-720591
Modified: ant/ivy/core/branches/2.0.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/CHANGES.txt?rev=726815&r1=726814&r2=726815&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.0.x/CHANGES.txt Mon Dec 15 13:44:13 2008
@@ -85,6 +85,8 @@
=====================================
- IMPROVEMENT: Ivy Standalone setting to overwrite publications (IVY-976)
+- FIX: Log levels aren't respected in certain cases using the standalone
functionality (IVY-960) (thanks to Patrick Woodworth)
+
2.0.0-rc2
=====================================
- DOCUMENTATION: Filesystem resolver: talks about "patterns" but does not
mention these must become absolute file paths (IVY-910)
Modified: ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/Main.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/Main.java?rev=726815&r1=726814&r2=726815&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/Main.java (original)
+++ ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/Main.java Mon Dec 15
13:44:13 2008
@@ -184,6 +184,7 @@
Ivy ivy = Ivy.newInstance();
initMessage(line, ivy);
IvySettings settings = initSettings(line, ivy);
+ ivy.pushContext();
File cache = new
File(settings.substitute(line.getOptionValue("cache", settings
.getDefaultCache().getAbsolutePath())));
@@ -296,6 +297,7 @@
invoke(ivy, cache, md, confs, fileList,
line.getOptionValue("main"), params);
}
ivy.getLoggerEngine().popLogger();
+ ivy.popContext();
}
/**
