mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-10 14:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ignore git config errors that may occur in enter_chroot.

Browse Source 
git config doesn't behave well if there are multiple callers
calling it at the same time.  Since this is best effort anyway,
I'm adding an || true so that multithreads calls to this don't
fail.

I removed my previous work around to this since it wasn't generic enough.

Change-Id: I12f2d3faaa745c1ff675a297bb09c567a88aa185

BUG=chromium-os:13070
TEST=Ran it a lot

Review URL: http://codereview.chromium.org/6693001
This commit is contained in:
Chris Sosa 2011-03-14 15:00:46 -07:00
parent fd73ffb28a
commit 9d30ce80fa
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/au_test_harness/cros_au_test_harness.py
View File

@ -53,7 +53,6 @@ def _PregenerateUpdates(options):
def _GenerateVMUpdate(target, src, private_key_path): def _GenerateVMUpdate(target, src, private_key_path):
"""Generates an update using the devserver.""" """Generates an update using the devserver."""
command = ['./enter_chroot.sh', command = ['./enter_chroot.sh',
'--nogit_config',
'--', '--',
'sudo', 'sudo',
'start_devserver', 'start_devserver',

10
enter_chroot.sh
View File

@ -44,8 +44,6 @@ DEFINE_string chrome_root "" \
DEFINE_string chrome_root_mount "/home/$USER/chrome_root" \ DEFINE_string chrome_root_mount "/home/$USER/chrome_root" \
"The mount point of the chrome broswer source in the chroot." "The mount point of the chrome broswer source in the chroot."
DEFINE_boolean git_config $FLAGS_TRUE \
"Config git to work with your user/pass in the chroot."
DEFINE_boolean official_build $FLAGS_FALSE \ DEFINE_boolean official_build $FLAGS_FALSE \
"Set CHROMEOS_OFFICIAL=1 for release builds." "Set CHROMEOS_OFFICIAL=1 for release builds."
DEFINE_boolean mount $FLAGS_FALSE "Only set up mounts." DEFINE_boolean mount $FLAGS_FALSE "Only set up mounts."
@ -362,13 +360,13 @@ if [ -d "$HOME/.subversion" ]; then
fi fi
# Configure committer username and email in chroot .gitconfig # Configure committer username and email in chroot .gitconfig
if [ $FLAGS_git_config -eq $FLAGS_TRUE ]; then
git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \ git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
user.name "$(cd /tmp; git var GIT_COMMITTER_IDENT | sed -e 's/ *<.*//')" user.name "$(cd /tmp; git var GIT_COMMITTER_IDENT | sed -e 's/ *<.*//')" ||
true
git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \ git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
user.email "$(cd /tmp; git var GIT_COMMITTER_IDENT | \ user.email "$(cd /tmp; git var GIT_COMMITTER_IDENT | \
sed -e 's/.*<\([^>]*\)>.*/\1/')" sed -e 's/.*<\([^>]*\)>.*/\1/')" ||
fi true
# Run command or interactive shell. Also include the non-chrooted path to # Run command or interactive shell. Also include the non-chrooted path to
# the source trunk for scripts that may need to print it (e.g. # the source trunk for scripts that may need to print it (e.g.