Repository: ambari
Updated Branches:
  refs/heads/trunk e8deead66 -> 1d76f9571


AMBARI-14408: common-services folder needs to be backed up upon ambari-server 
RPM upgrade (dili)


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

Branch: refs/heads/trunk
Commit: 1d76f9571e77978205054b143233480e1075b51e
Parents: e8deead
Author: Di Li <[email protected]>
Authored: Mon Jan 4 13:25:22 2016 -0500
Committer: Di Li <[email protected]>
Committed: Mon Jan 4 13:25:22 2016 -0500

----------------------------------------------------------------------
 ambari-server/src/main/package/deb/control/preinst | 2 +-
 ambari-server/src/main/package/rpm/preinstall.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1d76f957/ambari-server/src/main/package/deb/control/preinst
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/package/deb/control/preinst 
b/ambari-server/src/main/package/deb/control/preinst
index f640adb..7bf7365 100644
--- a/ambari-server/src/main/package/deb/control/preinst
+++ b/ambari-server/src/main/package/deb/control/preinst
@@ -57,7 +57,7 @@ then
     mv -f "$STACKS_FOLDER" "$STACKS_FOLDER_OLD"
 fi
 
-if [ -d "$COMMON_SERVICES_FOLDER_OLD" ]
+if [ -d "$COMMON_SERVICES_FOLDER" ]
 then
     mv -f "$COMMON_SERVICES_FOLDER" "$COMMON_SERVICES_FOLDER_OLD"
 fi

http://git-wip-us.apache.org/repos/asf/ambari/blob/1d76f957/ambari-server/src/main/package/rpm/preinstall.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/package/rpm/preinstall.sh 
b/ambari-server/src/main/package/rpm/preinstall.sh
index 313a169..9533964 100644
--- a/ambari-server/src/main/package/rpm/preinstall.sh
+++ b/ambari-server/src/main/package/rpm/preinstall.sh
@@ -32,7 +32,7 @@ then
     mv -f "$STACKS_FOLDER" "$STACKS_FOLDER_OLD"
 fi
 
-if [ -d "$COMMON_SERVICES_FOLDER_OLD" ]
+if [ -d "$COMMON_SERVICES_FOLDER" ]
 then
     mv -f "$COMMON_SERVICES_FOLDER" "$COMMON_SERVICES_FOLDER_OLD"
 fi

Reply via email to