ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject ambari git commit: AMBARI-16140: ambari-agent RPM yum update should backup both stack and common-services (dili)
Date Thu, 28 Apr 2016 15:31:04 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 35ebd80d8 -> 84a2595eb


AMBARI-16140: ambari-agent RPM yum update should backup both stack and common-services (dili)


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

Branch: refs/heads/trunk
Commit: 84a2595eb0dda84c4a7baf2b3e78a0ebc0b357be
Parents: 35ebd80
Author: Di Li <dili@apache.org>
Authored: Thu Apr 28 11:30:15 2016 -0400
Committer: Di Li <dili@apache.org>
Committed: Thu Apr 28 11:30:15 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/84a2595e/ambari-agent/src/main/package/deb/control/preinst
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/package/deb/control/preinst b/ambari-agent/src/main/package/deb/control/preinst
index 7265c55..a36ed51 100644
--- a/ambari-agent/src/main/package/deb/control/preinst
+++ b/ambari-agent/src/main/package/deb/control/preinst
@@ -42,7 +42,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/84a2595e/ambari-agent/src/main/package/rpm/preinstall.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/package/rpm/preinstall.sh b/ambari-agent/src/main/package/rpm/preinstall.sh
index d7419d3..f57b3bc 100644
--- a/ambari-agent/src/main/package/rpm/preinstall.sh
+++ b/ambari-agent/src/main/package/rpm/preinstall.sh
@@ -38,7 +38,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


Mime
View raw message