Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore file locks on OSX NFS mounts #2720

Merged
merged 1 commit into from
Jun 12, 2016

Conversation

alexcrichton
Copy link
Member

We already ignore NFS on Linux so let's do the same on OSX as well.

@rust-highfive
Copy link

r? @wycats

(rust_highfive has picked a reviewer for you, use r? to override)

@brson
Copy link
Contributor

brson commented Jun 11, 2016

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 11, 2016

📌 Commit db595e9 has been approved by brson

@bors
Copy link
Collaborator

bors commented Jun 11, 2016

⌛ Testing commit db595e9 with merge 5345f1c...

@bors
Copy link
Collaborator

bors commented Jun 11, 2016

💔 Test failed - cargo-mac-64

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Jun 12, 2016

📌 Commit fe77f00 has been approved by brson

@bors
Copy link
Collaborator

bors commented Jun 12, 2016

⌛ Testing commit fe77f00 with merge f91e6fe...

@bors
Copy link
Collaborator

bors commented Jun 12, 2016

💔 Test failed - cargo-mac-32

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Jun 12, 2016

📌 Commit 89f77f4 has been approved by brson

@bors
Copy link
Collaborator

bors commented Jun 12, 2016

⌛ Testing commit 89f77f4 with merge 57c71e5...

@bors
Copy link
Collaborator

bors commented Jun 12, 2016

💔 Test failed - cargo-mac-64

// do the same on OSX here. Note that ENOTSUP is an OSX_specific
// constant.
#[cfg(target_os = "macos")]
Err(ref e) if e.raw_os_error() == Some(libc::ENOTSUP) => return Ok(),

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok(()) // no ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops!

We already ignore NFS on Linux so let's do the same on OSX as well.
@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Collaborator

bors commented Jun 12, 2016

📌 Commit c8abb20 has been approved by brson

bors added a commit that referenced this pull request Jun 12, 2016
Ignore file locks on OSX NFS mounts

We already ignore NFS on Linux so let's do the same on OSX as well.
@bors
Copy link
Collaborator

bors commented Jun 12, 2016

⌛ Testing commit c8abb20 with merge 941f488...

@bors
Copy link
Collaborator

bors commented Jun 12, 2016

@bors bors merged commit c8abb20 into rust-lang:master Jun 12, 2016
@alexcrichton alexcrichton deleted the ignore-nfs-more-often branch June 16, 2016 09:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants