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

Check free space only if source exists and is dir #37062

Merged
merged 2 commits into from
Apr 21, 2023
Merged

Conversation

solracsf
Copy link
Member

@solracsf solracsf commented Mar 6, 2023

Summary

As disk_free_space() expects a directory, let's check if it is one before runing the code, return FileInfo::SPACE_UNKNOWN otherwise.

Checklist

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
@solracsf solracsf added the 3. to review Waiting for reviews label Mar 6, 2023
@solracsf solracsf added this to the Nextcloud 26 milestone Mar 6, 2023
@solracsf solracsf changed the title Fix free space problems Fix disk_free_space function Mar 6, 2023
@szaimen szaimen modified the milestones: Nextcloud 26, Nextcloud 27 Mar 7, 2023
@szaimen szaimen requested review from a team, ArtificialOwl, icewind1991 and blizzz and removed request for a team March 7, 2023 07:48
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

LGTM now but didnt test

@solracsf solracsf changed the title Fix disk_free_space function Check free space only if source exists and is dir Mar 8, 2023
@icewind1991 icewind1991 merged commit 4cc5885 into master Apr 21, 2023
@icewind1991 icewind1991 deleted the free-space branch April 21, 2023 11:55
@solracsf
Copy link
Member Author

/backport to stable26

@solracsf
Copy link
Member Author

/backport to stable25

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@solracsf
Copy link
Member Author

/backport to stable26

@solracsf
Copy link
Member Author

/backport to stable25

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants