STABLE14-macos-packaging-update-20060405

FIXES 29226

copy cellservdb if there is none

(cherry picked from commit b3120246765e9f5d144ac470b66269ccbbce48a9)

diff --git a/src/packaging/MacOS/OpenAFS.post_install b/src/packaging/MacOS/OpenAFS.post_install
index 88e3e9fd10bb69a41eef220953b2cb01b34b5dbb..c6ed97d2a14811bf118323a08785dcdc53b9e23c 100644 (file)
--- a/src/packaging/MacOS/OpenAFS.post_install
+++ b/src/packaging/MacOS/OpenAFS.post_install
@@ -47,7 +47,7 @@ if [ ! -f CellServDB -a -f CellServDB.save -a -f CellServDB.master.last ]; then
 fi
 
 # upgrading between 2 post-1.2.7 releases (or the testing case)
-if [ -f CellServDB.master.last -a  -f CellServDB ]; then
+if [ -f CellServDB.master.last ]; then
   if cmp -s CellServDB.master.last CellServDB.master ; then
     echo No CellServDB updates
     done=1
@@ -63,7 +63,7 @@ if [ -z "$done" -a  -f CellServDB ]; then
   fi
 fi
 
-if [ -z "$done" ]; then
+if [ -z "$done" -a  -f CellServDB ]; then
   # there are local changes to be merged
   if [ -f CellServDB -a -f CellServDB.master.last ]; then
     echo Merging CellServDB entries....