Skip to content

Conversation

@ggeorgg
Copy link

@ggeorgg ggeorgg commented Aug 26, 2018

Same request as in #165. Unfortunatley I was not able to interactively rebase my branch because of my poor git knowledge. This is why I had to reset my fork and applied the changes again. Sorry for confusing you...

Steps to reproduce:
Use Open SUSE Tumbleweed and install nextcloud via
sudo zypper in nextcloud
Point your browser to your nextcloud installation and select update channel daily. Reload the page and try to update your instance with the web based updater.
The update process will fail due to files which couldn't be removed beforehand by the updater itself. The files which cause this problem are symlinks that are generated at the installation because of
https://build.opensuse.org/package/view_file/openSUSE:Factory/nextcloud/nextcloud.spec?expand=1
Line 164: %fdupes -s $RPM_BUILD_ROOT/%{apache_serverroot}/%{name}
The problem is solved on my machine if we check for symlinks, files and folders in the delete functions.

@kesselb
Copy link
Contributor

kesselb commented Aug 27, 2018

Thank you for your contribution 👍 I have no idea why the build 💥

lib/Updater.php Outdated
$files[] = $fileInfo->getPathName();
} else {
$files[] = $fileInfo->getRealPath();
}
Copy link
Contributor

@kesselb kesselb Aug 27, 2018

Choose a reason for hiding this comment

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

After the closing parenthesis in line 730 there are additional spaces. For this reason the sameCodeCheck fails. Could you please remove this whitespace, signoff the commit and push again? Its ok to create another commit. No need to create a new pr here. Thank you 👍
image

Copy link
Author

Choose a reason for hiding this comment

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

Thanks for this correction. I removed the whitespace.

Copy link
Author

Choose a reason for hiding this comment

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

Thanks for your info. I thought I solved this now, but unfortunatley there are still two contionuous integraten tests red...
@MorrisJobke, @danielkesselberg Could you please help me or do this for me?
Thanks a lot ;)

index.php Outdated
$files[] = $fileInfo->getPathName();
} else {
$files[] = $fileInfo->getRealPath();
}
Copy link
Member

Choose a reason for hiding this comment

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

Could I ask you to fix the indentation? We use typically tabs (with a size of 4 spaces per tab).

@MorrisJobke
Copy link
Member

I have no idea why the build 💥

The first failure on stable13 is because we released a new 14 release and didn't updated this one here, so it could be ignored.

But there is a second failure which includes the sign-off message - see https://drone.nextcloud.com/nextcloud/updater/85/43

To learn more about this, please have a look at https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md#sign-your-work

Basically a git commit --amend -s will add the needed message and then this PR seems to be ready.

I will be on off for a few weeks, so it might be that there is no further feedback from my side so far.

Thanks for the contribution.

@ggeorgg
Copy link
Author

ggeorgg commented Sep 2, 2018

New pull request created: #184

@ggeorgg ggeorgg closed this Sep 2, 2018
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.

3 participants