commit 5d05760685c05ad0f55b9ac01efeadc207ba6bea
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Sep 29 13:54:43 2015 +0200
Revert "Initial attempt to integrate bundling-detection tool"
This reverts commit a6d6c500cc63b4218cfe891b9fd22c6a5e7c8def.
Not fully prepared yet, reverting for now.
depgenerators/maven.req | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 50ee30e..c144c0d 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -40,9 +40,7 @@ import traceback
from javapackages.common.config import get_config
from javapackages.common.util import (kill_parent_process,
init_rpmgen,
- get_logger,
- get_buildroot_files,
- execute_command)
+ get_logger)
from javapackages.cache.metadata import MetadataCache
from javapackages.maven.pom import POM
from javapackages.maven.dependency import Dependency
@@ -68,27 +66,6 @@ class TagBuilder(object):
self.provided_osgi = cache.get_provided_osgi()
self.metadata_dir = os.path.dirname(paths[0])
- if cache.is_fresh():
- detector = "/usr/bin/bundling-detector-java"
- if os.path.exists(detector) and os.access(detector, os.X_OK):
- check_files = get_buildroot_files(regexp="jar$")
- if len(check_files):
- check = " ".join(["'{f}'".format(f=x)
- for x in check_files])
- # TODO: do not hardcode these paths
- check_against = "/usr/share/java /usr/lib/java"
- cmd = "{c} -check {cf} -checkAgainst {ca}".format(c=detector,
- cf=check,
- ca=check_against)
- _log.info("Running bundling detection tool...")
- rc, stdout, stderr = execute_command(cmd)
- if stderr:
- _log.warn(stderr)
- if stdout:
- _log.info("===== bundling detection report =====")
- _log.info(stdout)
- _log.info("===== bundling detection report =====")
-
for path in paths:
metadata = cache.get_metadata_for_path(path)
self.print_requires(metadata)