[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.5.2-7-5-g0011845

[Niels Thykier]

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  0011845766a4a1ca8f7e8f2013b8e0b006f84e4f (commit)
      from  361d965618e17f09b91c1caa0ca25e4d8fa14a8d (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 0011845766a4a1ca8f7e8f2013b8e0b006f84e4f
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Dec 4 01:36:18 2010 +0100

    Backport fix for LP: #600584

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

Summary of changes:
 .../bp-osgi-allow-illegal-os-qualifier.patch       |   23 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 .../osgi/framework/internal/core/Framework.java    |    7 +++++-
 3 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/debian/patches/bp-osgi-allow-illegal-os-qualifier.patch b/debian/patches/bp-osgi-allow-illegal-os-qualifier.patch
new file mode 100644
index 0000000..94f78be
--- /dev/null
+++ b/debian/patches/bp-osgi-allow-illegal-os-qualifier.patch
@@ -0,0 +1,23 @@
+Description: Backport to allow illegal qualifiers in the OS version.
+Origin: upstream, https://bugs.eclipse.org/bugs/show_bug.cgi?id=305452
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=305452
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/600584
+
+diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
+index f33e314..ff32d77 100644
+--- a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
++++ b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
+@@ -358,7 +358,12 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
+ 				} catch (NoSuchElementException e) {
+ 					// ignore, use the values parsed so far
+ 				}
+-				value = new Version(major, minor, micro, qualifier).toString();
++				try {
++					value = new Version(major, minor, micro, qualifier).toString();
++				} catch (IllegalArgumentException e) {
++					// must be an invalid qualifier; just ignore it
++					value = new Version(major, minor, micro).toString();
++				}
+ 				properties.put(Constants.FRAMEWORK_OS_VERSION, value);
+ 			}
+ 		}
diff --git a/debian/patches/series b/debian/patches/series
index 34831f5..277c501 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ sat4j-version.patch
 add-o.e.equinox.concurrent.patch
 pdebuild-workspace.patch
 bp-osgi-ignore-root-CA.patch
+bp-osgi-allow-illegal-os-qualifier.patch
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
index f33e314..ff32d77 100644
--- a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
+++ b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
@@ -358,7 +358,12 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
 				} catch (NoSuchElementException e) {
 					// ignore, use the values parsed so far
 				}
-				value = new Version(major, minor, micro, qualifier).toString();
+				try {
+					value = new Version(major, minor, micro, qualifier).toString();
+				} catch (IllegalArgumentException e) {
+					// must be an invalid qualifier; just ignore it
+					value = new Version(major, minor, micro).toString();
+				}
 				properties.put(Constants.FRAMEWORK_OS_VERSION, value);
 			}
 		}


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