Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: move build config to proper place as well
......................................................................
packaging: setup: move build config to proper place as well
Change-Id: I39a384db8bc93dd0a5c0a0fe43e2c59e8e474a97
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/legacy-setup/ovirt-engine-reports-setup.py
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/17/23617/1
diff --git a/packaging/legacy-setup/ovirt-engine-reports-setup.py
b/packaging/legacy-setup/ovirt-engine-reports-setup.py
index 89d007c..fb20f76 100755
--- a/packaging/legacy-setup/ovirt-engine-reports-setup.py
+++ b/packaging/legacy-setup/ovirt-engine-reports-setup.py
@@ -57,6 +57,8 @@
REPORTS_SERVER_DIR = "/usr/share/%s" % JRS_PACKAGE_NAME
REPORTS_SERVER_BUILDOMATIC_DIR = "%s/buildomatic" % REPORTS_SERVER_DIR
REPORTS_DB_UPGRADE_SCRIPTS_DIR = "%s/install_resources/sql/postgresql" %
REPORTS_SERVER_BUILDOMATIC_DIR
+LEGACY_SERVER_BUILD="%s/build_conf/default" % REPORTS_SERVER_BUILDOMATIC_DIR
+REPORTS_BUILD="%s/build-conf" % PKG_STATE_DIR
FILE_DATABASE_ENGINE_CONFIG =
"/etc/ovirt-engine/engine.conf.d/10-setup-database.conf"
FILE_DATABASE_DWH_CONFIG =
"/etc/ovirt-engine-dwh/ovirt-engine-dwhd.conf.d/10-setup-database.conf"
FILE_DATABASE_REPORTS_CONFIG =
"/etc/ovirt-engine-reports/ovirt-engine-reports.conf.d/10-setup-database.conf"
@@ -1117,6 +1119,8 @@
if os.path.exists(LEGACY_WAR) and not os.path.exists(DIR_WAR):
shutil.copytree(LEGACY_WAR, DIR_WAR, symlinks=True)
+ if os.path.exists(LEGACY_SERVER_BUILD) and not
os.path.exists(REPORTS_BUILD):
+ shutil.copytree(LEGACY_SERVER_BUILD, REPORTS_BUILD,
symlinks=True)
warUpdated = isWarUpdated()
@@ -1314,6 +1318,8 @@
if os.path.exists(LEGACY_WAR):
shutil.rmtree(LEGACY_WAR)
+ if os.path.exists(LEGACY_SERVER_BUILD):
+ shutil.rmtree(LEGACY_SERVER_BUILD)
# Restore previous version
except:
--
To view, visit http://gerrit.ovirt.org/23617
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39a384db8bc93dd0a5c0a0fe43e2c59e8e474a97
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
