diff options
| author |  Dmitry Lomov <dslomov@google.com> | 2017-02-17 14:48:48 +0000 |
|---|---|---|
| committer | Dmitry Lomov <dslomov@google.com> | 2017-02-17 14:57:32 +0000 |
| commit | e36a66cd6e35e5b4b276f2b6ce63e1c691bcb02c (patch) | |
| tree | 7d2b273bf2948aa350147a91da3a6b4ad0111e34 /src/main/tools | |
| parent | 75639985d593f683ba13d2ceb38ec310662fb56b (diff) | |
Rollback of commit 4b73e972d909bcd533f2f9940f95a00b9b73bdde.
*** Reason for rollback ***
Broke tests on CI: http://ci.bazel.io/job/bazel-tests/570/
*** Original change description ***
Roll forward execroot change
RELNOTES[INC]: Previously, an external repository would be symlinked into the
execution root at execroot/local_repo/external/remote_repo. This changes it to
be at execroot/remote_repo. This may break genrules/Skylark actions that
hardcode execution root paths. If this causes breakages for you, ensure that
genrules are using $(location :target) to access files and Skylark rules are
using http://bazel.io/docs/skylark/lib/File.html's path, dirname, etc.
functions. Cust...
--
PiperOrigin-RevId: 147833177
MOS_MIGRATED_REVID=147833177
Diffstat (limited to 'src/main/tools')
| -rw-r--r-- | src/main/tools/linux-sandbox-pid1.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/tools/linux-sandbox-pid1.cc b/src/main/tools/linux-sandbox-pid1.cc index d8ff4547b3..2aba1273bf 100644 --- a/src/main/tools/linux-sandbox-pid1.cc +++ b/src/main/tools/linux-sandbox-pid1.cc @@ -297,8 +297,7 @@ static void MountFilesystems() { static bool ShouldBeWritable(char *mnt_dir) { mnt_dir += strlen(opt.sandbox_root_dir); - char *working_parent = dirname(strdupa(opt.working_dir)); - if (strncmp(working_parent, mnt_dir, strlen(working_parent)) == 0) { + if (strcmp(mnt_dir, opt.working_dir) == 0) { return true; } |