Google Git
Sign in
cos / mirrors / cros / chromiumos / platform / crosutils / 342f156c3594e34a47d0bab9a99fd0f7add9cb67
commit342f156c3594e34a47d0bab9a99fd0f7add9cb67[log] [tgz]
authorDavid James <davidjames@chromium.org>Fri Jul 15 15:21:18 2011 -0700
committerDavid James <davidjames@chromium.org>Fri Jul 15 15:31:45 2011 -0700
tree88cb760327bca2ba21754a2c4d12beebcb257c64
parentd6ae1ec95ef1532828bbf82f1b642d0966f08ca5 [diff]
enter_chroot should only modify things within a lock.

enter_chroot is often called from multiple processes and we expect that
it doesn't modify anything unless it's within a lock. This CL moves
chroot modifications up to occur during the lock so that we don't have
multiple modifications to .gitconfig occurring at the same time.

This prevents the following warning:
  error: could not lock config file
/b/cbuild/chroot/home/chrome-bot/.gitconfig: File exists

See http://chromeos-botmaster.mtv.corp.google.com:8026/builders/TOT%20Pre-Flight%20Queue/builds/3771/steps/Test/logs/stdio

BUG=chromium-os:17661
TEST=Run enter_chroot.sh and verify gitconfig is still setup.

Change-Id: I73a7755d62cce895c76b8e0f35838b3874e5db33
Reviewed-on: http://gerrit.chromium.org/gerrit/4208
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: David James <davidjames@chromium.org>
1 file changed
tree: 88cb760327bca2ba21754a2c4d12beebcb257c64
  1. bin/
  2. chroot_version_hooks.d/
  3. lib/
  4. mod_for_factory_scripts/
  5. mod_for_test_scripts/
  6. build_packages ⇨ ../third_party/chromiumos-overlay/chromeos/scripts/build_packages
  7. chromeos-common.sh ⇨ ../platform/installer/chromeos-common.sh
  8. cros_run_unit_tests ⇨ ../platform/crostestutils/cros_run_unit_tests
  9. generate_test_report ⇨ ../platform/crostestutils/utils_py/generate_test_report.py
  10. image_to_live.sh ⇨ ../platform/dev/host/image_to_live.sh
  11. make_chroot ⇨ ../third_party/chromiumos-overlay/chromeos/scripts/make_chroot
  12. run_remote_tests.sh ⇨ ../platform/crostestutils/run_remote_tests.sh
  13. setup_board ⇨ ../third_party/chromiumos-overlay/chromeos/scripts/setup_board
  14. sysroot_wrapper ⇨ ../third_party/chromiumos-overlay/chromeos/scripts/sysroot_wrapper
  15. .gitignore
  16. archive_build.sh
  17. archive_hwqual
  18. bash_completion
  19. build_gpt.sh
  20. build_image
  21. build_kernel_image.sh
  22. call_autoserv.py
  23. check_control_files.sh
  24. check_deps
  25. chromeos_blacklist
  26. clean_loopback_devices
  27. common.sh
  28. create_esp.sh
  29. create_legacy_bootloader_templates.sh
  30. cros_deps_diff
  31. cros_download_latest_image
  32. cros_generate_breakpad_symbols
  33. cros_generate_deps_graphs
  34. cros_show_stacks
  35. dot_helper.py
  36. emit_gpt_scripts.sh
  37. enable_localaccount.sh
  38. enter_chroot.sh
  39. file_copy.py
  40. fixup_image_for_qemu.py
  41. generate_au_zip.py
  42. get_latest_image.sh
  43. get_package_list
  44. image_to_usb.sh
  45. image_to_vm.sh
  46. inherit-review-settings-ok
  47. make_developer_script_runner.sh
  48. make_factory_package.sh
  49. make_netboot.sh
  50. make_universal_factory_shim.sh
  51. mk_memento_images.sh
  52. mod_image_for_recovery.sh
  53. mod_image_for_test.sh
  54. mount_gpt_image.sh
  55. remote_access.sh
  56. resize_stateful_partition.sh
  57. run_chroot_version_hooks
  58. serve_factory_packages.py
  59. set_shared_user_password.sh
  60. ssh_test.sh
  61. start_devserver
  62. test_build_root
  63. test_image
  64. update_bootloaders.sh
  65. update_chroot
  66. update_kernel.sh
  67. upload_symbols
  68. verify_rootfs_chksum.sh
  69. WATCHLISTS