Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Prepend $JAVA_HOME/bin to path ......................................................................
packaging: setup: Prepend $JAVA_HOME/bin to path Certain jasperreports utils do not strictly obey the setting of JAVA_HOME, using instead 'java' as found in $PATH. Change-Id: Ie178c18006aa7f07359ff44b38b56f26641d6cb7 Bug-Url: https://bugzilla.redhat.com/1211709 Signed-off-by: Yedidyah Bar David <d...@redhat.com> (cherry picked from commit 627e63d9ea7686c4da368623c7a879b6b88fdc68) --- M packaging/setup/ovirt_engine_setup/reports/reportsutil.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py 2 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/75/40075/1 diff --git a/packaging/setup/ovirt_engine_setup/reports/reportsutil.py b/packaging/setup/ovirt_engine_setup/reports/reportsutil.py index fa400d7..6613b61 100644 --- a/packaging/setup/ovirt_engine_setup/reports/reportsutil.py +++ b/packaging/setup/ovirt_engine_setup/reports/reportsutil.py @@ -118,6 +118,12 @@ 'JAVA_HOME': self.environment[ oengcommcons.ConfigEnv.JAVA_HOME ], + 'PATH': '{java_home}/bin:{cur_path}'.format( + java_home=self.environment[ + oengcommcons.ConfigEnv.JAVA_HOME + ], + cur_path=os.environ['PATH'], + ), 'JAVA_OPTS': '-Djava.io.tmpdir=%s' % self._javatmp, 'ADDITIONAL_CONFIG_DIR': ( oreportscons.FileLocations. @@ -144,6 +150,12 @@ 'JAVA_HOME': self.environment[ oengcommcons.ConfigEnv.JAVA_HOME ], + 'PATH': '{java_home}/bin:{cur_path}'.format( + java_home=self.environment[ + oengcommcons.ConfigEnv.JAVA_HOME + ], + cur_path=os.environ['PATH'], + ), 'JAVA_OPTS': '-Djava.io.tmpdir=%s' % self._javatmp, 'ADDITIONAL_CONFIG_DIR': ( oreportscons.FileLocations. diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py index 91871f5..2508979 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py @@ -187,6 +187,12 @@ 'JAVA_HOME': self.environment[ oengcommcons.ConfigEnv.JAVA_HOME ], + 'PATH': '{java_home}/bin:{cur_path}'.format( + java_home=self.environment[ + oengcommcons.ConfigEnv.JAVA_HOME + ], + cur_path=os.environ['PATH'], + ), 'ANT_OPTS': '-Djava.io.tmpdir=%s' % self._javatmp, }, cwd=os.path.join( -- To view, visit https://gerrit.ovirt.org/40075 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie178c18006aa7f07359ff44b38b56f26641d6cb7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: ovirt-engine-reports-3.5 Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
