From 4571675a785cf27b01455331d41629d0aa0c4c6d Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 16 May 2013 13:14:41 +0000
Subject: [PATCH] OPENDJ-904 RPM/Deb packages should not restart server after package update. - Modified RPM/Deb scripts - Modify RPM build number.
---
opends/src/build-tools/org/opends/build/tools/GenerateRpm.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
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 fea21f4..362de91 100644
--- a/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
+++ b/opends/src/build-tools/org/opends/build/tools/GenerateRpm.java
@@ -273,9 +273,14 @@
sb.append(" echo \"Pre Install - initial install\"" + EOL);
sb.append("else if [ \"$1\" == \"2\" ] ; then" + EOL);
sb.append(" echo \"Pre Install - upgrade install\"" + EOL);
- sb.append(" %{_prefix}/bin/stop-ds" + EOL);
- sb.append(" echo \"\"" + EOL);
- sb.append(" fi" + EOL);
+ sb.append("# If the server is running before upgrade, creates a file flag" + EOL);
+ sb.append(" if [ -f %{_prefix}/logs/server.pid ] " + EOL);
+ sb.append(" then" + EOL);
+ sb.append(" touch %{_prefix}/logs/status" + EOL);
+ sb.append(" fi" + EOL);
+ sb.append(" stopds=$(%{_prefix}/bin/stop-ds)" + EOL);
+ sb.append(" echo $stopds" + EOL);
+ sb.append(" fi" + EOL);
sb.append("fi" + EOL);
sb.append(EOL);
sb.append("# Post Install" + EOL);
@@ -291,9 +296,17 @@
// 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("# Upgrade ok, restarts the server" + EOL);
+ sb.append("# Upgrade ok " + EOL);
sb.append(" if [ \"$?\" == \"0\" ] ; then " + EOL);
- sb.append(" %{_prefix}/./bin/start-ds " + EOL);
+ sb.append("# Checks the server status flag for restart. " + EOL);
+ sb.append(" if [ -f %{_prefix}/logs/status ] " + EOL);
+ sb.append(" then" + EOL);
+ sb.append(" echo \"\"" + EOL);
+ sb.append(" echo \"Restarting server...\" " + EOL);
+ sb.append(" %{_prefix}/./bin/start-ds " + EOL);
+ sb.append(" echo \"\"" + EOL);
+ sb.append(" rm -f %{_prefix}/logs/status " + EOL);
+ sb.append(" fi" + EOL);
sb.append(" fi" + EOL);
sb.append("# Upgrade fails, needs user interaction (eg. manual mode)" + EOL);
sb.append(" if [ \"$?\" == \"2\" ] ; then " + EOL);
@@ -397,7 +410,7 @@
}
/**
- * A file filter for the rpm. Excludes all '.bat' and '.app' files.
+ * A file filter for the rpm. Excludes all '.bat', '.exe' and '.app' files.
*/
static final class PkgFileFilter implements FileFilter
{
@@ -413,7 +426,8 @@
}
else if (file.isFile())
{
- if (fileName.endsWith(".app") || fileName.endsWith(".bat"))
+ if (fileName.endsWith(".app") || fileName.endsWith(".bat")
+ || fileName.endsWith(".exe"))
{
return false;
}
--
Gitblit v1.10.0