Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Always regenerate jasper conf ......................................................................
packaging: setup: Always regenerate jasper conf Without this change, the following flow fails: * engine-setup * backup * cleanup * restore * setup Also add param 'customize' to _buildJs to allow calling gen-config without suffix (ce or pro). Required-By: http://gerrit.ovirt.org/25850 Related-To: https://bugzilla.redhat.com/1068979 Change-Id: I810cfae4e8ee4901e46fa49b46c7a8a41dde0bf1 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py 1 file changed, 17 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/98/25998/1 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 d1ce481..1502f97 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 @@ -158,7 +158,7 @@ if os.path.exists(entry['dst']): shutil.rmtree(entry['dst']) - def _buildJs(self, cmd, config): + def _buildJs(self, cmd, config, customize=True): try: myumask = os.umask(0o022) @@ -167,11 +167,14 @@ args=( './js-ant', '-DmasterPropsSource=%s' % config, - '%s-%s' % ( - cmd, - self.environment[ - oreportscons.JasperEnv.JASPER_NAME - ], + ( + cmd if not customize + else '%s-%s' % ( + cmd, + self.environment[ + oreportscons.JasperEnv.JASPER_NAME + ], + ) ), ), envAppend={ @@ -545,8 +548,6 @@ ) def _export(self): config = self._jasperConfiguration() - - self.logger.info(_('Exporting data out of Jasper')) self._quartzprops = os.path.join(self._temproot, 'quartzprops') if ( @@ -572,16 +573,19 @@ self._quartzprops, ) - self.logger.info( - _("Regenerating Jasper's build configuration files") - ) - - self._buildJs(config=config, cmd='gen-config') else: raise RuntimeError( _('Could not detect Jasper war folder') ) + self.logger.info( + _("Regenerating Jasper's build configuration files") + ) + + self._buildJs(config=config, cmd='gen-config', customize=False) + + self.logger.info(_('Exporting data out of Jasper')) + if ( self.environment[oreportscons.JasperEnv.JASPER_NAME] == 'pro' ): -- To view, visit http://gerrit.ovirt.org/25998 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I810cfae4e8ee4901e46fa49b46c7a8a41dde0bf1 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
