You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2014/09/15 17:38:47 UTC

git commit: AMBARI-7310. Error message on ambari-server removal.(vbrodetskyi)

Repository: ambari
Updated Branches:
  refs/heads/trunk 1719a5ce2 -> e3dba2634


AMBARI-7310. Error message on ambari-server removal.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e3dba263
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e3dba263
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e3dba263

Branch: refs/heads/trunk
Commit: e3dba263475ab4a29c57ed041539eebbef8f16d7
Parents: 1719a5c
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Mon Sep 15 18:38:01 2014 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Mon Sep 15 18:38:01 2014 +0300

----------------------------------------------------------------------
 ambari-agent/src/main/package/rpm/preremove.sh  | 2 +-
 ambari-server/src/main/package/rpm/preremove.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e3dba263/ambari-agent/src/main/package/rpm/preremove.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/package/rpm/preremove.sh b/ambari-agent/src/main/package/rpm/preremove.sh
index 5fb9be2..2078acd 100644
--- a/ambari-agent/src/main/package/rpm/preremove.sh
+++ b/ambari-agent/src/main/package/rpm/preremove.sh
@@ -29,7 +29,7 @@ if [ "$1" -eq 0 ]; then  # Action is uninstall
       /var/lib/ambari-agent/install-helper.sh remove
     fi
 
-    chkconfig --del ambari-agent
+    chkconfig --list | grep ambari-server && chkconfig --del ambari-server
 fi
 
 exit 0

http://git-wip-us.apache.org/repos/asf/ambari/blob/e3dba263/ambari-server/src/main/package/rpm/preremove.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/package/rpm/preremove.sh b/ambari-server/src/main/package/rpm/preremove.sh
index 073c07f..12b69b6 100644
--- a/ambari-server/src/main/package/rpm/preremove.sh
+++ b/ambari-server/src/main/package/rpm/preremove.sh
@@ -34,7 +34,7 @@ if [ "$1" -eq 0 ]; then  # Action is uninstall
       /var/lib/ambari-server/install-helper.sh remove
     fi
 
-    chkconfig --del ambari-server
+    chkconfig --list | grep ambari-server && chkconfig --del ambari-server
 fi
 
 exit 0