Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -urN noc-old/scripts/upgrade noc/scripts/upgrade
- --- noc-old/scripts/upgrade 2014-05-27 13:15:22.000000000 +0800
- +++ noc/scripts/upgrade 2014-05-28 15:25:45.660218831 +0800
- @@ -167,30 +167,31 @@
- info "Forcefully set NOC branch to $NOC_BRANCH"
- BRANCH=$NOC_BRANCH
- fi
- -if [ $BRANCH != "none" ]; then
- - UPGRADETS=./local/upgrade-time
- - touch $UPGRADETS
- - $HG pull -u $REPO || error_exit "$LINENO: Failed to pull repo $REPO"
- - if [ `$HG branch` = "$BRANCH" ]; then
- - $HG update || error_exit "$LINENO: Failed to update repo"
- - else
- - info "Switching to branch $BRANCH"
- - $HG update -c $BRANCH || error_exit "$LINENO: Failed to update to branch $BRANCH"
- - fi
- - if [ ./scripts/upgrade -nt $UPGRADETS ]; then
- - info "./scripts/upgrade has been upgraded. Restarting"
- - rm -f $UPGRADETS
- - exec ./scripts/upgrade "$@"
- - fi
- - rm -f $UPGRADETS
- -fi
- +#if [ $BRANCH != "none" ]; then
- +# UPGRADETS=./local/upgrade-time
- +# touch $UPGRADETS
- +# $HG pull -u $REPO || error_exit "$LINENO: Failed to pull repo $REPO"
- +# if [ `$HG branch` = "$BRANCH" ]; then
- +# $HG update || error_exit "$LINENO: Failed to update repo"
- +# else
- +# info "Switching to branch $BRANCH"
- +# $HG update -c $BRANCH || error_exit "$LINENO: Failed to update to branch $BRANCH"
- +# fi
- +# if [ ./scripts/upgrade -nt $UPGRADETS ]; then
- +# info "./scripts/upgrade has been upgraded. Restarting"
- +# rm -f $UPGRADETS
- +# exec ./scripts/upgrade "$@"
- +# fi
- +# rm -f $UPGRADETS
- +#fi
- ##
- ## Update required python modules
- ##
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement