Update chroot for chromite if needed.

Update chroot for chromite if needed.

Change-Id: I6593336a52b7298bd358f3e55531b2e6a9e6dff1

BUG=chromium-os:11883
TEST=Tried deleting the symlink and deleting the line from bashrc and things got updated; ran again w/ no problems.

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=ae573e7

[diandersAtChromium, 2011-02-09 21:53:06]

PTAL.  It's ugly, but that's how we decided to fixup things last time I needed
to do this.  Hope it's still OK.

http://codereview.chromium.org/6480005/diff/1/common.sh
File common.sh (right):

http://codereview.chromium.org/6480005/diff/1/common.sh#newcode579
common.sh:579: if ! [ -L
"${chroot_dir}/home/$USER/.local/lib/python2.6/site-packages/chromite" ]; then
Is there a good way to wrap this line?  ...or are we OK with it being a little
long?

[rochberg, 2011-02-09 22:00:16]

I don't know enough about the underlying fixes to LGTM, so I'm deferring to
Anush

http://codereview.chromium.org/6480005/diff/1/common.sh
File common.sh (right):

http://codereview.chromium.org/6480005/diff/1/common.sh#newcode574
common.sh:574: if ! grep -q "^PATH=.*/trunk/chromite/bin"
"${chroot_dir}/home/$USER/.bashrc"; then
CHROOT_HOME="${chroot_dir}/home/$USER" would fix both line breaks and maybe even
make the code easier to read.

[anush, 2011-02-09 22:22:14]

Can this be done as part of enter_chroot.sh ? common.sh is under a lockdown
just to prevent users from getting out of sync with what is installed in the
chroot and is in src/scripts.

On Wed, Feb 9, 2011 at 2:00 PM, <rochberg@chromium.org> wrote:

> I don't know enough about the underlying fixes to LGTM, so I'm deferring to
> Anush
>
>
>
> http://codereview.chromium.org/6480005/diff/1/common.sh
> File common.sh (right):
>
> http://codereview.chromium.org/6480005/diff/1/common.sh#newcode574
> common.sh:574: if ! grep -q "^PATH=.*/trunk/chromite/bin"
>
> "${chroot_dir}/home/$USER/.bashrc"; then
> CHROOT_HOME="${chroot_dir}/home/$USER" would fix both line breaks and
> maybe even make the code easier to read.
>
>
> http://codereview.chromium.org/6480005/
>

[diandersAtChromium, 2011-02-10 00:31:01]

Sure, I'll do it however you want.  The 'chroot_hacks_from_outside' was the
agreed upon place previously and is called only from enter_chroot.sh and
from make_chroot.sh.  ...but it's easy to make another "hacks" function
that's part of enter_chroot and call it parallel to the other "hacks"
function.

I'll submit a CL.

-Doug

---

On Wed, Feb 9, 2011 at 2:22 PM, Anush Elangovan(அனுஷ்)
<anush@chromium.org>wrote:

> Can this be done as part of enter_chroot.sh ? common.sh is under a lockdown
> just to prevent users from getting out of sync with what is installed in the
> chroot and is in src/scripts.
>
>
> On Wed, Feb 9, 2011 at 2:00 PM, <rochberg@chromium.org> wrote:
>
>> I don't know enough about the underlying fixes to LGTM, so I'm deferring
>> to
>> Anush
>>
>>
>>
>> http://codereview.chromium.org/6480005/diff/1/common.sh
>> File common.sh (right):
>>
>> http://codereview.chromium.org/6480005/diff/1/common.sh#newcode574
>> common.sh:574: if ! grep -q "^PATH=.*/trunk/chromite/bin"
>>
>> "${chroot_dir}/home/$USER/.bashrc"; then
>> CHROOT_HOME="${chroot_dir}/home/$USER" would fix both line breaks and
>> maybe even make the code easier to read.
>>
>>
>> http://codereview.chromium.org/6480005/
>>
>
>

[diandersAtChromium, 2011-02-10 17:43:38]

PTAL.

If you have a better name for chroot_hacks_too(), I'm certainly open to
suggestions.  It seemed like the best way to indicate that it has the same
purpose as chroot_hacks_from_outside() and only exists because common.sh is in
lockdown.


If someone doing a driveby has better suggestions for how to avoid the need for
this fixup, I'd also love to talk about it.

[anush, 2011-02-11 13:49:36]

Lgtm
On Feb 10, 2011 9:43 AM, <dianders@chromium.org> wrote:
> PTAL.
>
> If you have a better name for chroot_hacks_too(), I'm certainly open to
> suggestions. It seemed like the best way to indicate that it has the same
> purpose as chroot_hacks_from_outside() and only exists because common.sh
is
> in
> lockdown.
>
>
> If someone doing a driveby has better suggestions for how to avoid the
need
> for
> this fixup, I'd also love to talk about it.
>
> http://codereview.chromium.org/6480005/