[tycho] fedoraproject-p2: Fix incorrect metadata generation bugs
by Mat Booth
commit d9772a066b7ad74f8a8b84be91f5c076d328ab3a
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu Oct 9 20:59:38 2014 +0100
fedoraproject-p2: Fix incorrect metadata generation bugs
sources | 2 +-
tycho.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 3c37901..6b8fd6f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-b9defc01b3e31dd6b1af92431c1502b2 fedoraproject-p2-d7d453b.tar.xz
+d161fe939ac7b482269c0b1e10f089df fedoraproject-p2-621c4a0.tar.xz
127267aa75abd86df6815bcbd7f2492d tycho-0.21.0.tar.bz2
8303bf4c107a219ce0c916bb692046f6 eclipse-bootstrap.tar.xz
diff --git a/tycho.spec b/tycho.spec
index c678394..bc0ac2d 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -15,7 +15,7 @@
# %%global snap -SNAPSHOT
%global snap %{nil}
-%global fp_p2_sha d7d453b
+%global fp_p2_sha 621c4a0
%global fp_p2_version 0.0.1
%global fp_p2_snap -SNAPSHOT
@@ -23,7 +23,7 @@
Name: tycho
Version: 0.21.0
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -413,6 +413,9 @@ ln -s %{_javadir}/%{name}/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/
%{_javadocdir}/%{name}
%changelog
+* Thu Oct 09 2014 Mat Booth <mat.booth(a)redhat.com> - 0.21.0-17
+- fedoraproject-p2: Fix incorrect metadata generation bugs
+
* Tue Oct 07 2014 Mat Booth <mat.booth(a)redhat.com> - 0.21.0-16
- fedoraproject-p2: Update to latest snapshot
9 years, 7 months
[javapackages] [maven.req] Avoid KeyError exception when dealing with config file
by Michal Srb
commit 70167b39c23a805e9407ac3a26d91a9cc2a995ce
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Oct 9 13:21:52 2014 +0200
[maven.req] Avoid KeyError exception when dealing with config file
depgenerators/maven.req | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 00b3fa0..fffd9e7 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -123,7 +123,7 @@ class TagBuilder(object):
requires = set()
# always generate R on packages specified in config file
- always_req = self.config['always_generate']
+ always_req = self.config.get('always_generate', ())
requires.update([x for x in always_req])
unknown_deps = []
@@ -202,7 +202,7 @@ class TagBuilder(object):
requires = set()
for rule_name, fn in (('java_requires', Metadata.get_java_requires),
('java_devel_requires', Metadata.get_java_devel_requires)):
- rules = self.config[rule_name]
+ rules = self.config.get(rule_name, {})
if not rules.get('skip', False):
required_version = fn(metadata)
if required_version:
@@ -211,8 +211,9 @@ class TagBuilder(object):
'op': rules.get('cmp_operator', '>='),
'version': version_string}
requires.add("{pkg} {op} {version}".format(**parts))
- elif rules['always_generate']:
- requires.add(rules['package_name'])
+ elif rules.get('always_generate'):
+ if rules.get('package_name'):
+ requires.add(rules.get('package_name'))
return requires
def _filter_requires(self, requires):
@@ -244,7 +245,7 @@ class TagBuilder(object):
new_config = {}
configs = get_configs(['%{javaconfdir}'])
for config_file in configs:
- config = config_file['maven.req']
+ config = config_file.get('maven.req', {})
filters = set(new_config.get('filter_requires', ()))
filters = filters.union(config.get('filter_requires', ()))
new_config.update(config)
9 years, 7 months
[javapackages] [logging] Add forgotten license header
by Michal Srb
commit a9a16afefca30e03303e2d6fbaa1229d6097d7f9
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Oct 9 10:27:39 2014 +0200
[logging] Add forgotten license header
python/javapackages/common/logging.py | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/python/javapackages/common/logging.py b/python/javapackages/common/logging.py
index c5be9af..eb5d8d3 100644
--- a/python/javapackages/common/logging.py
+++ b/python/javapackages/common/logging.py
@@ -1,3 +1,36 @@
+#!/usr/bin/python
+# Copyright (c) 2014, Red Hat, Inc.
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of the Red Hat nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Michal Srb <msrb(a)redhat.com>
+
from __future__ import absolute_import
import logging
9 years, 7 months
[javapackages] Omit PyXB "Unable to convert DOM node to binding" warnings in RPM req/prov generators
by Michal Srb
commit 9e22a041e3bea79e8033643f1e54cc63874cee41
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Oct 9 10:08:40 2014 +0200
Omit PyXB "Unable to convert DOM node to binding" warnings in RPM req/prov generators
These warnings are generally harmless, but logs are full of them and
people are asking about them.
depgenerators/maven.prov | 2 ++
depgenerators/maven.req | 3 +++
depgenerators/osgi.prov | 2 ++
depgenerators/osgi.req | 2 ++
python/javapackages/common/logging.py | 16 ++++++++++++++++
5 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov
index 9606a3e..a942b68 100755
--- a/depgenerators/maven.prov
+++ b/depgenerators/maven.prov
@@ -38,6 +38,7 @@ import sys
import traceback
from javapackages.metadata.metadata import Metadata
from javapackages.common.util import kill_parent_process
+from javapackages.common.logging import init_logging
class TagBuilder:
@@ -60,6 +61,7 @@ class TagBuilder:
if __name__ == "__main__":
try:
+ init_logging()
builder = TagBuilder()
except Exception:
traceback.print_exc(file=sys.stderr)
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 85a9c52..00b3fa0 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -36,11 +36,13 @@ import os
import re
import sys
import traceback
+import logging
from lxml import etree
from javapackages.common.config import get_configs, get_buildroot
from javapackages.common.util import kill_parent_process, get_cachedir
+from javapackages.common.logging import init_logging
from javapackages.maven.pom import POM
from javapackages.maven.artifact import Artifact
from javapackages.metadata.metadata import Metadata
@@ -386,6 +388,7 @@ if __name__ == "__main__":
cachedir = get_cachedir(sys.argv[1])
else:
raise Exception("Missing param: cachedir")
+ init_logging()
builder = TagBuilder(cachedir=cachedir)
except Exception:
traceback.print_exc(file=sys.stderr)
diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov
index 9b7aebd..b80a662 100755
--- a/depgenerators/osgi.prov
+++ b/depgenerators/osgi.prov
@@ -32,6 +32,7 @@
import javapackages.common.osgi as osgi
from javapackages.common.util import kill_parent_process, get_cachedir
+from javapackages.common.logging import init_logging
import sys
import os
import traceback
@@ -57,6 +58,7 @@ if __name__ == "__main__":
cachedir = get_cachedir(sys.argv[1])
else:
raise Exception("Missing param: cachedir")
+ init_logging()
builder = TagBuilder(cachedir=cachedir)
except Exception:
traceback.print_exc(file=sys.stderr)
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 5f48de1..4ef20e6 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -33,6 +33,7 @@
import javapackages.common.osgi as osgi
import javapackages.common.config as config
from javapackages.common.util import kill_parent_process, get_cachedir
+from javapackages.common.logging import init_logging
import sys
import pickle
import os
@@ -82,6 +83,7 @@ if __name__ == "__main__":
cachedir = get_cachedir(sys.argv[1])
else:
raise Exception("Missing param: cachedir")
+ init_logging()
builder = TagBuilder(cachedir=cachedir)
except Exception:
traceback.print_exc(file=sys.stderr)
diff --git a/python/javapackages/common/logging.py b/python/javapackages/common/logging.py
new file mode 100644
index 0000000..c5be9af
--- /dev/null
+++ b/python/javapackages/common/logging.py
@@ -0,0 +1,16 @@
+from __future__ import absolute_import
+import logging
+
+
+class SkipPyXBWarningsFilter(logging.Filter):
+ def filter(self, record):
+ return not record.getMessage().startswith("Unable to convert DOM node")
+
+
+def init_logging():
+ """Initialize loggers"""
+
+ # Omit PyXB "Unable to convert DOM node to binding" warnings
+ logger = logging.getLogger("pyxb.binding.basis")
+ f = SkipPyXBWarningsFilter()
+ logger.addFilter(f)
9 years, 7 months
[Bug 1147821] New: jenkins-icon-shim: No manifest at /var/lib/jenkins/plugins/jenkins-icon-shim.jpi/META-INF/MANIFEST.MF
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1147821
Bug ID: 1147821
Summary: jenkins-icon-shim: No manifest at
/var/lib/jenkins/plugins/jenkins-icon-shim.jpi/META-IN
F/MANIFEST.MF
Product: Fedora
Version: 21
Component: jenkins-icon-shim
Assignee: msrb(a)redhat.com
Reporter: msrb(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, msimacek(a)redhat.com,
msrb(a)redhat.com
Description of problem:
Jenkins logs contain following error:
SEVERE: Failed Inspecting plugin /var/lib/jenkins/plugins/jenkins-icon-shim.jpi
java.io.IOException: Plugin installation failed. No manifest at
/var/lib/jenkins/plugins/jenkins-icon-shim.jpi/META-INF/MANIFEST.MF
at
hudson.ClassicPluginStrategy.createPluginWrapper(ClassicPluginStrategy.java:156)
at hudson.PluginManager$1$3$1.run(PluginManager.java:296)
at
org.jvnet.hudson.reactor.TaskGraphBuilder$TaskImpl.run(TaskGraphBuilder.java:169)
at org.jvnet.hudson.reactor.Reactor.runTask(Reactor.java:282)
at jenkins.model.Jenkins$7.runTask(Jenkins.java:885)
at org.jvnet.hudson.reactor.Reactor$2.run(Reactor.java:210)
at org.jvnet.hudson.reactor.Reactor$Node.run(Reactor.java:117)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
jenkins-icon-shim plugin installs .jpi file into /var/lib/jenkins/plugins/, but
it should install only its unzipped content there and symlink needed JARs from
/usr/share/java/.
How reproducible:
always
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=08klMqIUph&a=cc_unsubscribe
9 years, 7 months