Skip to content

Use zsyncfile API, remove duplicated code - #6389

Merged
ckamm merged 1 commit into
delta-syncfrom
delta-zsync-refactor
Mar 22, 2018
Merged

Use zsyncfile API, remove duplicated code#6389
ckamm merged 1 commit into
delta-syncfrom
delta-zsync-refactor

Conversation

@ckamm

@ckamm ckamm commented Mar 15, 2018

Copy link
Copy Markdown
Contributor

Combines with ahmedammar/zsync#1

Note that this is based on #6382 to allow actual testing. This PR has only one commit: c742b4a

@ckamm ckamm self-assigned this Mar 15, 2018
@ckamm
ckamm requested a review from ogoffart March 15, 2018 13:37
@ckamm ckamm added this to the 2.5.0 milestone Mar 16, 2018
@ckamm
ckamm force-pushed the delta-zsync-refactor branch from c742b4a to 168115d Compare March 16, 2018 09:54
@ogoffart

Copy link
Copy Markdown
Contributor

CI system is confused:

fatal: reference is not a tree: dde7f5b80d4f8fe0ef3a2959852f0a8ed9cafb5c
Unable to checkout 'dde7f5b80d4f8fe0ef3a2959852f0a8ed9cafb5c' in submodule path 'src/3rdparty/zsync'

Should we maybe put zsync in the owncloud umbrella ?

@ckamm

ckamm commented Mar 16, 2018

Copy link
Copy Markdown
Contributor Author

I think that's just the pain of using git submodules like that, it wouldn't go away if it was inside the oc organization. I need to update the pointed submodule ref once the PR there has been merged. (which is done)

@ckamm

ckamm commented Mar 16, 2018

Copy link
Copy Markdown
Contributor Author

Do not merge yet because I need to update the submodule sha1 to the correct one after the zsync PR got merged.

This removes various low-level zsync code that was copied into the
client because there was no API previously.
@ckamm
ckamm force-pushed the delta-zsync-refactor branch from 168115d to d7a3058 Compare March 16, 2018 12:27
@ckamm

ckamm commented Mar 16, 2018

Copy link
Copy Markdown
Contributor Author

@ogoffart CI fails with

src/3rdparty/zsync/c/libzsync/zsync.c:44:23: fatal error: arpa/inet.h: No such file or directory

Who do I ask about making this header available?

@ogoffart

Copy link
Copy Markdown
Contributor

Who do I ask about making this header available?

Modify the admin/linux/DockerFile and update accordingly the docker image in the Jenkinsfile
I gess @dschmidt might be able to help with that.

@ckamm

ckamm commented Mar 21, 2018

Copy link
Copy Markdown
Contributor Author

@dschmidt I'd add libc6-dev to Dockerfile for this PR. Would you be able to rebuild the image?

@ckamm
ckamm force-pushed the delta-zsync-refactor branch from 83feb4a to d7a3058 Compare March 22, 2018 13:51
@ckamm

ckamm commented Mar 22, 2018

Copy link
Copy Markdown
Contributor Author

The problem will be resolved by adjusting zsync headers. ahmedammar/zsync#3

@ckamm
ckamm merged commit f743219 into delta-sync Mar 22, 2018
@ckamm
ckamm deleted the delta-zsync-refactor branch March 22, 2018 13:51
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.

2 participants