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

prefer using dir instead of allinfo for getting smb file info #10803

Merged
merged 4 commits into from
Aug 24, 2018

Conversation

icewind1991
Copy link
Member

@icewind1991 icewind1991 commented Aug 22, 2018

some windows server setups don't seem to like the allinfo command use the dir command instead to get the file info where possible.

Also includes some improvements for the timezone detection to properly handle cases where the command errors out.

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Aug 22, 2018
@icewind1991 icewind1991 added this to the Nextcloud 14 milestone Aug 22, 2018
}

// fallback to server timezone
$this->timeZone = date_default_timezone_get();
Copy link
Member

Choose a reason for hiding this comment

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

This will just overwrite the stuff above...

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed 🙈

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

🐘

@MorrisJobke
Copy link
Member

As this is in 3rdparty: shouldn't upstream be updated first?

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 24, 2018
@MorrisJobke
Copy link
Member

Triggered CI again: https://drone.nextcloud.com/nextcloud/server/9856

@rullzer
Copy link
Member

rullzer commented Aug 24, 2018

Signed-off-by: Robin Appelman <robin@icewind.nl>
@MorrisJobke MorrisJobke merged commit b1410df into master Aug 24, 2018
@MorrisJobke MorrisJobke deleted the smb-dir-instead-of-allinfo branch August 24, 2018 17:30
@rullzer rullzer mentioned this pull request Aug 24, 2018
3 tasks
@MorrisJobke MorrisJobke mentioned this pull request Aug 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants