From b1304f2d353bc0de780f4d635fc9cbd48328bfcb Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Sun, 16 Oct 2011 12:18:50 -0700 Subject: [PATCH 1/4] if RECLONE is set, reclone the directories --- stack.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stack.sh b/stack.sh index a7eacbfac1..73342327a5 100755 --- a/stack.sh +++ b/stack.sh @@ -297,6 +297,12 @@ function git_clone { cd $2 # This checkout syntax works for both branches and tags git checkout $3 + elif [[ "$RECLONE" == "yes" ]]; then + cd $2 + git remote set-url origin $1 + git fetch origin + git branch -D $3 + git checkout $3 fi } From aa8bb244be4cda5a83d0e5faee9767e3f0171ff9 Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Sun, 16 Oct 2011 12:24:11 -0700 Subject: [PATCH 2/4] rearrange order of setup.py develop as novaclient is needed by nova in essex --- stack.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack.sh b/stack.sh index 73342327a5..65b991fcf5 100755 --- a/stack.sh +++ b/stack.sh @@ -328,10 +328,10 @@ git_clone $OPENSTACKX_REPO $OPENSTACKX_DIR $OPENSTACKX_BRANCH # setup our checkouts so they are installed into python path # allowing ``import nova`` or ``import glance.client`` -cd $NOVA_DIR; sudo python setup.py develop -cd $NOVACLIENT_DIR; sudo python setup.py develop cd $KEYSTONE_DIR; sudo python setup.py develop cd $GLANCE_DIR; sudo python setup.py develop +cd $NOVACLIENT_DIR; sudo python setup.py develop +cd $NOVA_DIR; sudo python setup.py develop cd $OPENSTACKX_DIR; sudo python setup.py develop cd $DASH_DIR/django-openstack; sudo python setup.py develop cd $DASH_DIR/openstack-dashboard; sudo python setup.py develop From 64c2ba225a936af765be4229243666c26ccd42b9 Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Sun, 16 Oct 2011 19:08:04 -0700 Subject: [PATCH 3/4] fixes anthony's comment about not working if you aren't switching branches --- stack.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stack.sh b/stack.sh index 65b991fcf5..e96ffbcf50 100755 --- a/stack.sh +++ b/stack.sh @@ -301,8 +301,9 @@ function git_clone { cd $2 git remote set-url origin $1 git fetch origin + git checkout origin/$3 git branch -D $3 - git checkout $3 + git checkout -b $3 fi } From 59a285cd863ef2a7e2eed22eafbfd0a1fac6f1a9 Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Mon, 17 Oct 2011 10:39:28 -0700 Subject: [PATCH 4/4] change variable to RESET_BRANCHES --- stack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.sh b/stack.sh index e96ffbcf50..a953c9e97b 100755 --- a/stack.sh +++ b/stack.sh @@ -297,7 +297,7 @@ function git_clone { cd $2 # This checkout syntax works for both branches and tags git checkout $3 - elif [[ "$RECLONE" == "yes" ]]; then + elif [[ "$RESET_BRANCHES" == "yes" ]]; then cd $2 git remote set-url origin $1 git fetch origin