[bnd] 01/01: Removed the recursion in macro warnings causing out of memory errors

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository bnd.

commit 96cfcd3c609b5fc7c732595d67715963f2267205
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Jan 2 12:14:37 2016 +0100

    Removed the recursion in macro warnings causing out of memory errors
---
 debian/changelog                                       |  7 +++++++
 debian/patches/remove-recursion-in-macro-warning.patch | 15 +++++++++++++++
 debian/patches/series                                  |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d737b3b..d2d3c1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bnd (2.4.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the recursion in macro warnings causing out of memory errors.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 02 Jan 2016 12:12:44 +0100
+
 bnd (2.4.1-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/remove-recursion-in-macro-warning.patch b/debian/patches/remove-recursion-in-macro-warning.patch
new file mode 100644
index 0000000..417126f
--- /dev/null
+++ b/debian/patches/remove-recursion-in-macro-warning.patch
@@ -0,0 +1,15 @@
+Description: Remove the recursion in macro warnings causing out of memory errors
+Origin: backport, https://github.com/bjhargrave/bnd/commit/81f7fdb
+Bug: https://github.com/bndtools/bnd/issues/724
+Bug-Debian: https://bugs.debian.org/809602
+--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java
++++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java
+@@ -225,7 +225,7 @@
+ 		if (value != null)
+ 			return value;
+ 		if (!flattening && !key.startsWith("@"))
+-			domain.warning("No translation found for macro: %s, in %s", key, domain);
++			domain.warning("No translation found for macro: %s", key);
+ 		return "${" + key + "}";
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3761400..942c8a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ no-osgi-annotations.patch
 disable-jpm-plugin.patch
 gradle-compatibility.patch
 use-bootstrapped-gradle-plugin.patch
+remove-recursion-in-macro-warning.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git