Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: set legacy reports war from env ......................................................................
packaging: setup: set legacy reports war from env Bug-Url: https://bugzilla.redhat.com/1077775 Change-Id: Id93dd898e76e25e4652b8909670d163b84c3549d Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/ovirt_engine_setup/reportsconstants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py 2 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/05/26005/1 diff --git a/packaging/setup/ovirt_engine_setup/reportsconstants.py b/packaging/setup/ovirt_engine_setup/reportsconstants.py index 0bd4b65..c8052cd 100644 --- a/packaging/setup/ovirt_engine_setup/reportsconstants.py +++ b/packaging/setup/ovirt_engine_setup/reportsconstants.py @@ -218,6 +218,8 @@ def ADMIN_PASSWORD(self): return 'OVESETUP_REPORTS_CONFIG/adminPassword' + LEGACY_REPORTS_WAR = 'OVESETUP_REPORTS_CONFIG/legacyReportsWar' + @util.export @util.codegen 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 ecee2db..0aa340e 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 @@ -463,6 +463,10 @@ oreportscons.JasperEnv.THEME, 'ovirt-reports-theme' ) + self.environment.setdefault( + oreportscons.ConfigEnv.LEGACY_REPORTS_WAR, + oreportscons.FileLocations.LEGACY_OVIRT_ENGINE_REPORTS_JASPER_WAR + ) @plugin.event( stage=plugin.Stages.STAGE_SETUP, @@ -561,8 +565,7 @@ ) elif ( os.path.exists( - oreportscons.FileLocations. - LEGACY_OVIRT_ENGINE_REPORTS_JASPER_WAR + self.environment[oreportscons.ConfigEnv.LEGACY_REPORTS_WAR] ) ): shutil.copyfile( @@ -1041,7 +1044,7 @@ ) def _closeup(self): for d in ( - oreportscons.FileLocations.LEGACY_OVIRT_ENGINE_REPORTS_JASPER_WAR, + self.environment[oreportscons.ConfigEnv.LEGACY_REPORTS_WAR], os.path.join( self.environment[oreportscons.ConfigEnv.JASPER_HOME], ( -- To view, visit http://gerrit.ovirt.org/26005 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id93dd898e76e25e4652b8909670d163b84c3549d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
