[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. ee8cb5bd34d3830f5671074c1e31dd0edf2b49be

[Benjamin Drung]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, master has been updated
       via  ee8cb5bd34d3830f5671074c1e31dd0edf2b49be (commit)
       via  0f4e31bf0c77c1ee364c78b134b331110a5327ea (commit)
      from  c589053f3b9c40fa62b79cf142897e25a76a1d32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ee8cb5bd34d3830f5671074c1e31dd0edf2b49be
Merge: c589053f3b9c40fa62b79cf142897e25a76a1d32 0f4e31bf0c77c1ee364c78b134b331110a5327ea
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Mar 2 18:07:06 2010 +0100

    Merge branch 'upstream'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   11 +++++++++++
 .../linuxtools/eclipsebuild/SymlinkOSGiJars.java   |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 928a4fd..ab822ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-02  Andrew Overholt  <overholt at redhat.com>
+
+	* dependencies.properties: Fix up Debian jasper JAR location.
+
+2010-03-02  Andrew Overholt  <overholt at redhat.com>
+
+	* dependencies.properties: 
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
+	(execute): Continue to next potential system JAR instead of failing if the
+	first one doesn't work.
+
 2010-03-01  Andrew Overholt  <overholt at redhat.com>
 
 	* build.xml: Re-symlink to system JARs after p2 director installation.
diff --git a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
index 7f34c0f..56a7cff 100644
--- a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
+++ b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
@@ -54,7 +54,7 @@ public class SymlinkOSGiJars extends Task {
 			for (int i = 0; i < systemLocationList.length; i++) {
 				File systemFile = new File(systemLocationList[i]);
 				if (!systemFile.exists())
-					break;
+					continue;
 				log("Seeing if " + systemFile + " is a suitable match for " + origLocation, Project.MSG_DEBUG);
 
 				JarFile systemJarFile;


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.