STOUT-FACTORY: Fix buildbot error on Chrome reorder. [chromiumos/overlays/chromiumos-overlay : factory-2993.B]

[Shawn Nematbakhsh (Code Review)]

Shawn Nematbakhsh has uploaded a new change for review.

https://gerrit.chromium.org/gerrit/56554


Change subject: STOUT-FACTORY: Fix buildbot error on Chrome reorder.
......................................................................

STOUT-FACTORY: Fix buildbot error on Chrome reorder.

Buildbot fails with reorder error due to existing directory. Try
removing directory first.
(Partial merge of I01efa7ca92f794ef9cb91710331a67058dd70c08 by glotov)

BUG=chrome-os-partner:19692.
TEST=None.

Change-Id: Ife11d1c70edbb2ab938c55b4613b1838d21583ea
---
M chromeos-base/chromeos-chrome/chromeos-chrome-24.0.1287.1_rc-r1.ebuild
M chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
2 files changed, 4 insertions(+), 2 deletions(-)


git pull ssh://gerrit.chromium.org:29418/chromiumos/overlays/chromiumos-overlay refs/changes/54/56554/1

diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-24.0.1287.1_rc-r1.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-24.0.1287.1_rc-r1.ebuild
index ecdf487..b33a468 100644
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-24.0.1287.1_rc-r1.ebuild
+++ b/chromeos-base/chromeos-chrome/chromeos-chrome-24.0.1287.1_rc-r1.ebuild
@@ -675,11 +675,12 @@
EGIT_REPO_URI="http://git.chromium.org/chromiumos/profile/chromium.git"
EGIT_COMMIT="5caa2a82643e54de628d407d3e72299127599649"
EGIT_PROJECT="${PN}-reorder"
- if grep -q ${EGIT_COMMIT} "${CHROME_DISTDIR}/${REORDER_SUBDIR}/.git/HEAD"; then
+ if grep -qs ${EGIT_COMMIT} "${CHROME_DISTDIR}/${REORDER_SUBDIR}/.git/HEAD"; then
einfo "Reorder profile repo is up to date."
else
einfo "Reorder profile repo not up-to-date. Fetching..."
EGIT_SOURCEDIR="${CHROME_DISTDIR}/${REORDER_SUBDIR}"
+ rm -rf "${EGIT_SOURCEDIR}"
git-2_src_unpack
fi
fi
diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
index d182ffe..2ec1f2e 100644
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
+++ b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
@@ -675,11 +675,12 @@
EGIT_REPO_URI="http://git.chromium.org/chromiumos/profile/chromium.git"
EGIT_COMMIT="5caa2a82643e54de628d407d3e72299127599649"
EGIT_PROJECT="${PN}-reorder"
- if grep -q ${EGIT_COMMIT} "${CHROME_DISTDIR}/${REORDER_SUBDIR}/.git/HEAD"; then
+ if grep -qs ${EGIT_COMMIT} "${CHROME_DISTDIR}/${REORDER_SUBDIR}/.git/HEAD"; then
einfo "Reorder profile repo is up to date."
else
einfo "Reorder profile repo not up-to-date. Fetching..."
EGIT_SOURCEDIR="${CHROME_DISTDIR}/${REORDER_SUBDIR}"
+ rm -rf "${EGIT_SOURCEDIR}"
git-2_src_unpack
fi
fi

--
To view, visit https://gerrit.chromium.org/gerrit/56554
To unsubscribe, visit https://gerrit.chromium.org/gerrit/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife11d1c70edbb2ab938c55b4613b1838d21583ea
Gerrit-PatchSet: 1
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: factory-2993.B
Gerrit-Owner: Shawn Nematbakhsh <sha...@chromium.org>

[Shawn Nematbakhsh (Code Review)]

Shawn Nematbakhsh has posted comments on this change.

Change subject: STOUT-FACTORY: Fix buildbot error on Chrome reorder.
......................................................................

Patch Set 1: Looks good to me, approved; Ready; Verified

--
To view, visit https://gerrit.chromium.org/gerrit/56554
To unsubscribe, visit https://gerrit.chromium.org/gerrit/settings

Gerrit-MessageType: comment

Gerrit-Change-Id: Ife11d1c70edbb2ab938c55b4613b1838d21583ea
Gerrit-PatchSet: 1
Gerrit-Project: chromiumos/overlays/chromiumos-overlay
Gerrit-Branch: factory-2993.B
Gerrit-Owner: Shawn Nematbakhsh <sha...@chromium.org>

Gerrit-Reviewer: Shawn Nematbakhsh <sha...@chromium.org>