Alex Lourie has uploaded a new change for review.
Change subject: packaging: creating a version file for fetching product version
......................................................................
packaging: creating a version file for fetching product version
Change-Id: I479668e0d82007d283743f732067d58c73d1ea15
Signed-off-by: Alex Lourie <alou...@redhat.com>
---
M Makefile
M packaging/fedora/setup/basedefs.py
M packaging/fedora/setup/common_utils.py
M packaging/fedora/setup/engine-setup.py
M packaging/fedora/spec/ovirt-engine.spec.in
5 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/11383/1
diff --git a/Makefile b/Makefile
index 07436dc..c9809ca 100644
--- a/Makefile
+++ b/Makefile
@@ -409,6 +409,9 @@
# USB filter:
install -m 644 frontend/usbfilter.txt $(DESTDIR)$(PKG_SYSCONF_DIR)
+ # Create a version file
+ echo $(RPM_VERSION) > $(DESTDIR)$(PKG_SYSCONF_DIR)/version
+
install_jboss_modules:
@echo "*** Deploying JBoss modules"
diff --git a/packaging/fedora/setup/basedefs.py
b/packaging/fedora/setup/basedefs.py
index a89eee0..ce3b45e 100644
--- a/packaging/fedora/setup/basedefs.py
+++ b/packaging/fedora/setup/basedefs.py
@@ -103,6 +103,7 @@
FILE_HTTPD_SSL_CONFIG="/etc/httpd/conf.d/ssl.conf"
FILE_HTTPD_CONF="/etc/httpd/conf/httpd.conf"
FILE_IMAGE_UPLOADER_CONF="/etc/ovirt-engine/imageuploader.conf"
+FILE_ENGINE_VERSION = "/etc/ovirt-engine/version"
# File containing the local configuration of the engine:
FILE_ENGINE_SYSCONFIG="/etc/sysconfig/ovirt-engine"
diff --git a/packaging/fedora/setup/common_utils.py
b/packaging/fedora/setup/common_utils.py
index 9e001f1..b637236 100755
--- a/packaging/fedora/setup/common_utils.py
+++ b/packaging/fedora/setup/common_utils.py
@@ -1332,6 +1332,11 @@
return "%s-%s" % (res[0]['version'], res[0]['release'])
+def getEngineVersion():
+ # Just read the info from the file
+ with open(basedefs.FILE_ENGINE_VERSION) as version:
+ return version.readlines()[0]
+
def installed(rpm):
try:
getRpmVersion(rpmName=rpm)
diff --git a/packaging/fedora/setup/engine-setup.py
b/packaging/fedora/setup/engine-setup.py
index e7bab64..4402acf 100755
--- a/packaging/fedora/setup/engine-setup.py
+++ b/packaging/fedora/setup/engine-setup.py
@@ -1114,7 +1114,7 @@
currentDbName = basedefs.DB_NAME
# Update rpm version in vdc options
- utils.updateVDCOption("ProductRPMVersion",
utils.getRpmVersion(basedefs.ENGINE_RPM_NAME))
+ utils.updateVDCOption("ProductRPMVersion", utils.getEngineVersion())
except:
# Upgrade failed! we need to restore the old db
logging.debug("DB upgrade failed, restoring it to a previous state. DB
was backed up to %s", dbBackupFile)
@@ -1178,7 +1178,7 @@
"DataDir":["/usr/share/ovirt-engine", 'text'],
"SignScriptName":["SignReq.sh", 'text'],
"OrganizationName":[controller.CONF["ORG_NAME"], 'text'],
-
"ProductRPMVersion":[utils.getRpmVersion(basedefs.ENGINE_RPM_NAME), 'text'],
+ "ProductRPMVersion":[utils.getEngineVersion(), 'text'],
"AdminPassword":[controller.CONF["AUTH_PASS"], 'pass']
}
)
diff --git a/packaging/fedora/spec/ovirt-engine.spec.in
b/packaging/fedora/spec/ovirt-engine.spec.in
index 6b7135d..af1fa28 100644
--- a/packaging/fedora/spec/ovirt-engine.spec.in
+++ b/packaging/fedora/spec/ovirt-engine.spec.in
@@ -568,6 +568,7 @@
# Engine configuration files:
%dir %attr(-, %{engine_user}, %{engine_group}) %{engine_etc}
%config(noreplace) %attr(-, %{engine_user}, %{engine_group})
%{engine_etc}/engine.conf
+%{engine_etc}/version
# Files needed by the service:
%config(noreplace) %{_sysconfdir}/security/limits.d/10-ovirt-engine.conf
--
To view, visit http://gerrit.ovirt.org/11383
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I479668e0d82007d283743f732067d58c73d1ea15
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alex Lourie <alou...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
