Commit a83f9fc0 authored by anarcat's avatar anarcat

move manual provision detection code to preinst to limit the damages in case it happens

parent 3db2d8c3
......@@ -28,11 +28,6 @@ VARLIB="/var/aegir"
case "$1" in
configure)
if [ -d $VARLIB/.drush/provision ]; then
echo "existing provision in $VARLIB/.drush/provision detected, move away and try again"
exit 1
fi
# add a aegir user if one does not already exist
if ! getent passwd aegir >/dev/null ; then
echo "adding aegir user..."
......
......@@ -22,6 +22,13 @@ case "$1" in
echo "disabled manual drush_make in /var/aegir/.drush/drush_make"
echo "this should probably be removed after checking nothing will be lost"
fi
if [ -d $VARLIB/.drush/provision ]; then
echo "existing provision install in $VARLIB/.drush/drush_make detected"
echo "this needs to be removed or moved away for the install to be completed"
echo "try: rm -rf $VARLIB/.drush/provision"
exit 1
fi
;;
abort-upgrade)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment