Yaniv Dary has uploaded a new change for review.

Change subject: packaging: setup: improve method to detect jrs version
......................................................................

packaging: setup: improve method to detect jrs version

Change-Id: I2d42aac84660a6ea1ac8919a551edaee5255db7d
Signed-off-by: Yaniv Dary <[email protected]>
---
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/93/24793/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 c0882ec..df2dcb0 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
@@ -592,18 +592,22 @@
             os.path.join(
                 self.environment[oreportscons.ConfigEnv.JASPER_HOME],
                 'buildomatic',
-                'js-install-*.sh',
+                'conf_source',
+                'ie*',
             )
         )
         if len(install) != 1:
             raise RuntimeError(
-                _('Unexpected jasper installation, js-install-*.sh is missing')
+                _(
+                    'Unexpected jasper installation, '
+                    'buildomatic lib folder is missing'
+                )
             )
         self.environment[
             oreportscons.JasperEnv.JASPER_NAME
         ] = os.path.basename(install[0]).replace(
-            'js-install-', ''
-        ).replace('.sh', '')
+            'ie', ''
+        ).lower()
 
     @plugin.event(
         stage=plugin.Stages.STAGE_MISC,


-- 
To view, visit http://gerrit.ovirt.org/24793
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d42aac84660a6ea1ac8919a551edaee5255db7d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Yaniv Dary <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to