Author: dbaum
Date: Mon Oct 12 11:40:20 2009
New Revision: 824299
URL: http://svn.apache.org/viewvc?rev=824299&view=rev
Log:
fix -defaults for absoliute patsh (FELIX-1738)
Modified:
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
Modified:
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
URL:
http://svn.apache.org/viewvc/felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java?rev=824299&r1=824298&r2=824299&view=diff
==============================================================================
---
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
(original)
+++
felix/trunk/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
Mon Oct 12 11:40:20 2009
@@ -176,7 +176,12 @@
try
{
- File file = new File(base, defaults).getCanonicalFile();
+ File file = new File(defaults);
+ if (!file.isAbsolute()) {
+ file = new File(base, defaults);
+ }
+ file = file.getCanonicalFile();
+
URL url = file.toURL();
BldProperties bp = new BldProperties(file.getParentFile(),
bldOverrides);