From c973e6c96ce0d37bc22877f3af65135989c469e4 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 5 Nov 2014 09:52:27 +1100 Subject: [PATCH] Move platform check after localrc This got moved around with some of the recent cleanups I think. My CI was putting FORCE=yes into localrc which used to work. Noticed doing some bring-up on F21 Change-Id: I7c0ea6b67b42b768278de0fd41d0c0bfbb572387 --- stack.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/stack.sh b/stack.sh index ec13338948..38ecceb717 100755 --- a/stack.sh +++ b/stack.sh @@ -90,16 +90,6 @@ source $TOP_DIR/lib/config # and ``DISTRO`` GetDistro -# Warn users who aren't on an explicitly supported distro, but allow them to -# override check and attempt installation with ``FORCE=yes ./stack`` -if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|rhel6|rhel7) ]]; then - echo "WARNING: this script has not been tested on $DISTRO" - if [[ "$FORCE" != "yes" ]]; then - die $LINENO "If you wish to run this script anyway run with FORCE=yes" - fi -fi - - # Global Settings # --------------- @@ -151,6 +141,15 @@ if [[ ! -r $TOP_DIR/stackrc ]]; then fi source $TOP_DIR/stackrc +# Warn users who aren't on an explicitly supported distro, but allow them to +# override check and attempt installation with ``FORCE=yes ./stack`` +if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|rhel6|rhel7) ]]; then + echo "WARNING: this script has not been tested on $DISTRO" + if [[ "$FORCE" != "yes" ]]; then + die $LINENO "If you wish to run this script anyway run with FORCE=yes" + fi +fi + # Check to see if we are already running DevStack # Note that this may fail if USE_SCREEN=False if type -p screen > /dev/null && screen -ls | egrep -q "[0-9]\.$SCREEN_NAME"; then