From 1d53a142cd6fe3a4c7fe49c46a9210ed9d2499cd Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 23 Sep 2013 11:51:20 +0300 Subject: Improve on previous commit to use repo sync -f, make sure we use normal as last. To ensure source code integrity. --- build-scripts/helpers | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'build-scripts/helpers') diff --git a/build-scripts/helpers b/build-scripts/helpers index 5a9a26b..5c8fc42 100644 --- a/build-scripts/helpers +++ b/build-scripts/helpers @@ -27,6 +27,13 @@ setup-repo-vars () { } +repo-sync-stubborn () { + for i in 1 2; do + time repo sync $REPO_QUIET -j$SYNC_JOBS -f || true + done + time repo sync $REPO_QUIET -j$SYNC_JOBS +} + repo-sync-from-mirror () { setup-repo-vars repo init $REPO_QUIET -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}" $REPO_MIRROR -g $REPO_GROUPS @@ -39,7 +46,7 @@ repo-sync-from-mirror () { cp processed-manifest.xml .repo/manifest.xml echo ---------------------------- - time repo sync $REPO_QUIET -j$SYNC_JOBS -f + repo-sync-stubborn # Restore source manifest temporarily to create pinned manifest cp out/source-manifest.xml .repo/manifest.xml repo manifest -r -o out/pinned-manifest.xml @@ -72,7 +79,7 @@ repo-sync-from-seed () { cp processed-manifest.xml .repo/manifest.xml export TIMEFORMAT="TIME: Repo sync (using seed as reference): %lR" - time repo sync $REPO_QUIET -j$SYNC_JOBS -f + repo-sync-stubborn unset TIMEFORMAT # Restore source manifest temporarily to create pinned manifest -- cgit v1.2.3