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

fixed detection of server version in cmd client similar to gui client (2nd try, signed off) #6023

Merged
merged 1 commit into from
Sep 7, 2023

Conversation

errror
Copy link
Contributor

@errror errror commented Sep 5, 2023

first check status.php for version and then capabilities, only use version string if not empty

this also fixes 'File names containing the character ":" are not supported on this file system.' errors in nextcloudcmd (on Linux): The invalidFilenameRegex was set to a static default in case the server version was not set correctly. As newer versions of nextcloud do not return the version in capabilities but status.php, the server version was empty.

As I did not find a way to fullfil your requirements in my first PR, I created a new one. This one has a commit message with a correct Signed-off line. It also has no other changes as I did not enable the actions in this fork.

@claucambra
Copy link
Collaborator

Thanks for the changes!

@codecov
Copy link

codecov bot commented Sep 5, 2023

Codecov Report

Merging #6023 (b1db1fb) into master (23d324b) will increase coverage by 0.00%.
The diff coverage is n/a.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #6023   +/-   ##
=======================================
  Coverage   60.14%   60.15%           
=======================================
  Files         145      145           
  Lines       18868    18868           
=======================================
+ Hits        11349    11350    +1     
+ Misses       7519     7518    -1     

see 1 file with indirect coverage changes

Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

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

In updating the branch you have added a merge commit -- please don't update the contents of the PR with the "Update branch" button as this adds merge commits to your pull request

Once you have removed the merge commit, we will be able to merge

@errror
Copy link
Contributor Author

errror commented Sep 6, 2023

In updating the branch you have added a merge commit -- please don't update the contents of the PR with the "Update branch" button as this adds merge commits to your pull request

ok, will remember this for the future.

Once you have removed the merge commit, we will be able to merge

I have removed the merge commit!

@claucambra
Copy link
Collaborator

claucambra commented Sep 6, 2023

In updating the branch you have added a merge commit -- please don't update the contents of the PR with the "Update branch" button as this adds merge commits to your pull request

ok, will remember this for the future.

Once you have removed the merge commit, we will be able to merge

I have removed the merge commit!

Thanks!

One last thing -- the sign-off points to [email protected] but it seems your commit is in fact authored under the email [email protected]. Could you amend the commit and either A) modify the signed-off-by OR B) modify your author email in the commit?

This will allow our CI pipeline to pass and we can merge the PR

@errror
Copy link
Contributor Author

errror commented Sep 6, 2023

One last thing -- the sign-off points to [email protected] but it seems your commit is in fact authored under the email [email protected]. Could you amend the commit and either A) modify the signed-off-by OR B) modify your author email in the commit?

This will allow our CI pipeline to pass and we can merge the PR

I fixed the author of my commit message to match the sign-off.

@claucambra
Copy link
Collaborator

One last thing -- the sign-off points to [email protected] but it seems your commit is in fact authored under the email [email protected]. Could you amend the commit and either A) modify the signed-off-by OR B) modify your author email in the commit?
This will allow our CI pipeline to pass and we can merge the PR

I fixed the author of my commit message to match the sign-off.

Awesome, thanks!

@claucambra
Copy link
Collaborator

/backport to stable-3.10

first check status.php for version and then capabilities, only use version string if not empty

this also fixes 'File names containing the character ":" are not supported on this file system.' errors in nextcloudcmd (on Linux): The invalidFilenameRegex was set to a static default in case the server version was not set correctly. As newer versions of nextcloud do not return the version in capabilities but status.php, the server version was empty.

Signed-off-by: Patrick Cernko <[email protected]>
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6023-b1db1fb59999837227e5e64ce28d36fd2f4cf4dd-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@claucambra claucambra disabled auto-merge September 7, 2023 02:31
@claucambra claucambra merged commit 0cbbd81 into nextcloud:master Sep 7, 2023
9 of 10 checks passed
@mgallien mgallien added this to the 3.11.0 milestone Sep 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants