Skip to content
This repository has been archived by the owner on Jan 31, 2018. It is now read-only.

Commit

Permalink
[Bug 805020] Don't checkout any branch on vendor.
Browse files Browse the repository at this point in the history
Vendor is a gitsubmodule, which means we should be obeying git's idea of
what commit it should be on. We should not checkout out a particular
branch, because this can cause changes to come in to early, such as the
celery 2.6 upgrade, which caused bug 805020.

Additionally, I added --recursive to the submodule checkout in the main
repo, since we aren't doing this explicitly in vendor anymore.
  • Loading branch information
mythmon committed Oct 24, 2012
1 parent 7bb276e commit 6d29f56
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions bin/update_site.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
LOCALE_REPO_URL = 'https://svn.mozilla.org/projects/l10n-misc/trunk/input/locale'

GIT_PULL = "git pull -q origin %(branch)s"
GIT_SUBMODULE = "git submodule update --init"
GIT_SUBMODULE = "git submodule update --init --recursive"
SVN_CO = "svn checkout --force %(url)s locale"
SVN_UP = "svn update"
COMPILE_MO = "./bin/compile-mo.sh %(localedir)s %(unique)s"
Expand Down Expand Up @@ -83,9 +83,6 @@ def update_site(env, debug):
]

commands += [
(CHDIR, os.path.join(here, 'vendor')),
(EXEC, GIT_PULL % vendor_branch),
(EXEC, GIT_SUBMODULE),
(CHDIR, os.path.join(here)),
(EXEC, 'python2.6 manage.py migrate --all'),
(EXEC, 'python2.6 manage.py collectstatic --noinput'),
Expand Down

0 comments on commit 6d29f56

Please sign in to comment.