Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: sed 's/foomatic/buildomatic' ......................................................................
packaging: setup: sed 's/foomatic/buildomatic' /me/ do not know to read. Change-Id: I7b8025b6b5718e1a50c40f6261938a89e5a47bc5 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/setup/ovirt_engine_setup/reportsconstants.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/jasper/deploy.py 4 files changed, 21 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/49/24349/1 diff --git a/packaging/setup/ovirt_engine_setup/reportsconstants.py b/packaging/setup/ovirt_engine_setup/reportsconstants.py index 19cf614..ae19134 100644 --- a/packaging/setup/ovirt_engine_setup/reportsconstants.py +++ b/packaging/setup/ovirt_engine_setup/reportsconstants.py @@ -103,12 +103,12 @@ 'WEB-INF', 'js.quartz.properties', ) - OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG = os.path.join( + OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG = os.path.join( PKG_STATE_DIR, 'build-conf', ) - OVIRT_ENGINE_REPORTS_FOOMATIC_DBPROP = os.path.join( - OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG, + OVIRT_ENGINE_REPORTS_BUILDOMATIC_DBPROP = os.path.join( + OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG, 'master.properties', ) OVIRT_ENGINE_JASPER_CUSTOMIZATION = os.path.join( @@ -162,13 +162,13 @@ 'js.quartz.properties', ) - LEGACY_OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG = os.path.join( + LEGACY_OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG = os.path.join( 'buildomatic', 'build_conf', ) - LEGACY_OVIRT_ENGINE_REPORTS_FOOMATIC_DBPROP = os.path.join( - LEGACY_OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG, + LEGACY_OVIRT_ENGINE_REPORTS_BUILDOMATIC_DBPROP = os.path.join( + LEGACY_OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG, 'default', 'master.properties', ) diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py index 0c430ae..0491027 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/db/connection.py @@ -107,15 +107,18 @@ def _setup(self): p = None if os.path.exists( - oreportscons.FileLocations.OVIRT_ENGINE_REPORTS_FOOMATIC_DBPROP + oreportscons.FileLocations.OVIRT_ENGINE_REPORTS_BUILDOMATIC_DBPROP ): - p = oreportscons.FileLocations.OVIRT_ENGINE_REPORTS_FOOMATIC_DBPROP + p = ( + oreportscons.FileLocations. + OVIRT_ENGINE_REPORTS_BUILDOMATIC_DBPROP + ) elif os.path.exists( os.path.join( self.environment[oreportscons.ConfigEnv.JASPER_HOME], ( oreportscons.FileLocations. - LEGACY_OVIRT_ENGINE_REPORTS_FOOMATIC_DBPROP + LEGACY_OVIRT_ENGINE_REPORTS_BUILDOMATIC_DBPROP ), ) ): @@ -124,7 +127,7 @@ self.environment[oreportscons.ConfigEnv.JASPER_HOME], ( oreportscons.FileLocations. - LEGACY_OVIRT_ENGINE_REPORTS_FOOMATIC_DBPROP + LEGACY_OVIRT_ENGINE_REPORTS_BUILDOMATIC_DBPROP ), ) diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py index e30a9b5..80c606d 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-reports/jasper/clear.py @@ -95,7 +95,7 @@ oreportscons.FileLocations. OVIRT_ENGINE_REPORTS_JASPER_MODULES, oreportscons.FileLocations. - OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG, + OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG, ): if os.path.exists(src): shutil.rmtree(src) 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 6519c46..f78d776 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 @@ -118,7 +118,7 @@ oreportscons.FileLocations. OVIRT_ENGINE_REPORTS_JASPER_MODULES, oreportscons.FileLocations. - OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG, + OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG, ): if os.path.exists(src): dst = '%s.%s' % (src, suffix) @@ -237,7 +237,7 @@ os.umask(myumask) # - # foomatic config + # buildomatic config # contains sensitive information # for some reason jasper recreate # it, so we cannot be fully secured while @@ -245,12 +245,12 @@ # if os.path.exists( oreportscons.FileLocations. - OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG + OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG ): os.chmod( ( oreportscons.FileLocations. - OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG + OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG ), 0o700, ) @@ -278,7 +278,7 @@ 'JAVA_OPTS': '-Djava.io.tmpdir=%s' % self._javatmp, 'ADDITIONAL_CONFIG_DIR': ( oreportscons.FileLocations. - OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG + OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG ), }, ) @@ -304,7 +304,7 @@ 'JAVA_OPTS': '-Djava.io.tmpdir=%s' % self._javatmp, 'ADDITIONAL_CONFIG_DIR': ( oreportscons.FileLocations. - OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG + OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG ), }, ) @@ -884,7 +884,7 @@ self.environment[oreportscons.ConfigEnv.JASPER_HOME], ( oreportscons.FileLocations. - LEGACY_OVIRT_ENGINE_REPORTS_FOOMATIC_CONFIG + LEGACY_OVIRT_ENGINE_REPORTS_BUILDOMATIC_CONFIG ), ), ): -- To view, visit http://gerrit.ovirt.org/24349 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b8025b6b5718e1a50c40f6261938a89e5a47bc5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
