From 96c360b7818d32d2ce04be37329e97834d5ed62c Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 16 Nov 2015 14:05:01 +0000
Subject: [PATCH] OPENDJ-2364 Use force to upgrade packages
---
opendj-packages/opendj-deb/resources/control/postinst | 2 +-
opendj-packages/opendj-rpm/resources/specs/postinstall.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opendj-packages/opendj-deb/resources/control/postinst b/opendj-packages/opendj-deb/resources/control/postinst
index 305c4bb..06367c2 100644
--- a/opendj-packages/opendj-deb/resources/control/postinst
+++ b/opendj-packages/opendj-deb/resources/control/postinst
@@ -39,7 +39,7 @@
# For being secure, we check the buildinfo file too.
if [ -f ${deb.prefix}/config/buildinfo ] ; then
echo *Starting upgrade...
- ${deb.prefix}/./upgrade -n --acceptLicense
+ ${deb.prefix}/./upgrade -n --force --acceptLicense
echo
if [ "$?" -eq 0 ] ; then
diff --git a/opendj-packages/opendj-rpm/resources/specs/postinstall.sh b/opendj-packages/opendj-rpm/resources/specs/postinstall.sh
index fd4f2ea..cf31cb4 100644
--- a/opendj-packages/opendj-rpm/resources/specs/postinstall.sh
+++ b/opendj-packages/opendj-rpm/resources/specs/postinstall.sh
@@ -43,7 +43,7 @@
echo "Post Install - upgrade install"
# Only if the instance has been configured
if [ -e "%{_prefix}"/config/buildinfo ] && [ "$(ls -A "%{_prefix}"/config/archived-configs)" ] ; then
- "%{_prefix}"/./upgrade -n --acceptLicense
+ "%{_prefix}"/./upgrade -n --force --acceptLicense
# If upgrade is ok, checks the server status flag for restart
if [ "$?" == "0" ] && [ -f "%{_prefix}"/logs/status ] ; then
echo ""
--
Gitblit v1.10.0