Shirly Radco has uploaded a new change for review. Change subject: reports: remove war file for new db ......................................................................
reports: remove war file for new db updated abort, when clean install will remove deployed files. Change-Id: Id4a88458e583f93874ef6fc6a7f683c0e1760e40 Bug-Url: https://bugzilla.redhat.com/1072357 Signed-off-by: Shirly Radco <sra...@redhat.com> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/71/29071/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 83e1fe0..6133c33 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 @@ -81,6 +81,9 @@ dst = '%s.%s' % (src, suffix) self._restore.append(dict(src=src, dst=dst)) os.rename(src, dst) + else: + dst = None + self._restore.append(dict(src=src, dst=dst)) if not self._parent.environment[ oreportscons.DBEnv.NEW_DATABASE @@ -132,9 +135,10 @@ self._parent.logger.info(_('Rolling back Reports files')) for entry in self._restore: try: - if os.path.exists(entry['src']): - shutil.rmtree(entry['src']) - os.rename(entry['dst'], entry['src']) + if entry['dst'] is not None: + if os.path.exists(entry['src']): + shutil.rmtree(entry['src']) + os.rename(entry['dst'], entry['src']) except Exception as e: self._parent.logger.debug( 'Exception during rename %s->%s', @@ -155,7 +159,7 @@ def commit(self): for entry in self._restore: - if os.path.exists(entry['dst']): + if if entry['dst'] is not None and os.path.exists(entry['dst']): shutil.rmtree(entry['dst']) def _buildJs(self, cmd, config, noSuffix=False): -- To view, visit http://gerrit.ovirt.org/29071 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4a88458e583f93874ef6fc6a7f683c0e1760e40 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: ovirt-engine-reports-3.4 Gerrit-Owner: Shirly Radco <sra...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
