Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: file handling to own stage
......................................................................
packaging: setup: file handling to own stage
Change-Id: Ib3464257d9e9ca8b18d374be199f89833f705499
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py
1 file changed, 22 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/70/24970/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 b392722..13f3d71 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
@@ -815,16 +815,6 @@
self.logger.info(_('Configuring Jasper Database resources'))
- for f in glob.glob(
- os.path.join(
- oreportscons.FileLocations.OVIRT_ENGINE_REPORTS_JASPER_WAR,
- 'WEB-INF',
- 'lib',
- 'postgresql-*.jar',
- )
- ):
- os.unlink(f)
-
with self.XMLDoc(
os.path.join(
oreportscons.FileLocations.OVIRT_ENGINE_REPORTS_JASPER_WAR,
@@ -936,6 +926,28 @@
self._importJs(everything)
+ @plugin.event(
+ stage=plugin.Stages.STAGE_MISC,
+ after=(
+ oreportscons.Stages.DB_SCHEMA,
+ ),
+ condition=lambda self: self.environment[oreportscons.CoreEnv.ENABLE],
+ )
+ def _artifacts(self):
+
+ #
+ # Remove embedded psql resources
+ #
+ for f in glob.glob(
+ os.path.join(
+ oreportscons.FileLocations.OVIRT_ENGINE_REPORTS_JASPER_WAR,
+ 'WEB-INF',
+ 'lib',
+ 'postgresql-*.jar',
+ )
+ ):
+ os.unlink(f)
+
#
# Files contain password
#
--
To view, visit http://gerrit.ovirt.org/24970
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3464257d9e9ca8b18d374be199f89833f705499
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
