Merge "launcher: Update repo after applying clone.bundle"

This commit is contained in:
Dan Willemsen 2015-09-14 23:40:05 +00:00 committed by Gerrit Code Review
commit 7b01b2fd01

5
repo
View File

@ -20,7 +20,7 @@ REPO_REV = 'stable'
# limitations under the License. # limitations under the License.
# increment this whenever we make important changes to this script # increment this whenever we make important changes to this script
VERSION = (1, 21) VERSION = (1, 22)
# increment this if the MAINTAINER_KEYS block is modified # increment this if the MAINTAINER_KEYS block is modified
KEYRING_VERSION = (1, 2) KEYRING_VERSION = (1, 2)
@ -567,8 +567,7 @@ def _Clone(url, local, quiet):
'+refs/heads/*:refs/remotes/origin/*') '+refs/heads/*:refs/remotes/origin/*')
if _DownloadBundle(url, local, quiet): if _DownloadBundle(url, local, quiet):
_ImportBundle(local) _ImportBundle(local)
else: _Fetch(url, local, 'origin', quiet)
_Fetch(url, local, 'origin', quiet)
def _Verify(cwd, branch, quiet): def _Verify(cwd, branch, quiet):