From fb2f4c907286d354b5b1cfab495ae67a4b887c6e Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 28 May 2013 11:43:17 +0000
Subject: [PATCH] OPENDJ-929 Package Upgrade: license should be automatically accepted Added --acceptLicense to upgrade's command line in packages (RPM / Deb)
---
opends/resource/debian/control/postinst | 2 +-
opends/src/build-tools/org/opends/build/tools/GenerateRpm.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opends/resource/debian/control/postinst b/opends/resource/debian/control/postinst
index 3fdaf98..fd3e6a8 100644
--- a/opends/resource/debian/control/postinst
+++ b/opends/resource/debian/control/postinst
@@ -11,7 +11,7 @@
if [ -f @prefix@/config/buildinfo ]
then
echo *Starting upgrade...
- @prefix@/./upgrade -n
+ @prefix@/./upgrade -n --acceptLicense
echo
# Upgrade fails - Requires mandatory user interaction.
# Nevertheless, exits successfully of the pkg process.
diff --git a/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java b/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
index 70f117a..335df83 100644
--- a/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
+++ b/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
@@ -302,7 +302,7 @@
// Starts the upgrade. The new files are automatically imported
// by rpm manager, which compares files between last & actual version.
// Copies / deletes files depending of new package.
- sb.append(" %{_prefix}/./upgrade -n" + EOL);
+ sb.append(" %{_prefix}/./upgrade -n --acceptLicense" + EOL);
sb.append("# Upgrade ok " + EOL);
sb.append(" if [ \"$?\" == \"0\" ] ; then " + EOL);
sb.append("# Checks the server status flag for restart. " + EOL);
--
Gitblit v1.10.0