Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1055)

Unified Diff: enter_chroot.sh

Issue 6693001: Ignore git config errors that may occur in enter_chroot. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bin/au_test_harness/cros_au_test_harness.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: enter_chroot.sh
diff --git a/enter_chroot.sh b/enter_chroot.sh
index 973d1980490a19929d441983a2b9f86d45bf5aa1..b3da25f34dc637da85a6d3402cf15713f01b3709 100755
--- a/enter_chroot.sh
+++ b/enter_chroot.sh
@@ -44,8 +44,6 @@ DEFINE_string chrome_root "" \
DEFINE_string chrome_root_mount "/home/$USER/chrome_root" \
"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 \
"Set CHROMEOS_OFFICIAL=1 for release builds."
DEFINE_boolean mount $FLAGS_FALSE "Only set up mounts."
@@ -362,13 +360,13 @@ if [ -d "$HOME/.subversion" ]; then
fi
# 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 \
- user.name "$(cd /tmp; git var GIT_COMMITTER_IDENT | sed -e 's/ *<.*//')"
- git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
- user.email "$(cd /tmp; git var GIT_COMMITTER_IDENT | \
- sed -e 's/.*<\([^>]*\)>.*/\1/')"
-fi
+git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
+ user.name "$(cd /tmp; git var GIT_COMMITTER_IDENT | sed -e 's/ *<.*//')" ||
+ true
+git config -f ${FLAGS_chroot}/home/${USER}/.gitconfig --replace-all \
+ user.email "$(cd /tmp; git var GIT_COMMITTER_IDENT | \
+ sed -e 's/.*<\([^>]*\)>.*/\1/')" ||
+ true
# 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.
« no previous file with comments | « bin/au_test_harness/cros_au_test_harness.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698