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.

Sign up for GitHub

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

Adjust switch Digest::Zsync to separate package #431

Merged
merged 1 commit into from
Nov 16, 2023
Merged

Adjust switch Digest::Zsync to separate package #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 0 additions & 86 deletions lib/Digest/Zsync.pm
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion lib/MirrorCache/Task/FolderHashesCreate.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ sub calcMetalink {
my ($zsync_lengths, $zsync_block_size, $zsync_hashes);
if ($zsync) {
$zsync_lengths = $zsync->lengths;
$zsync_block_size = $zsync->block_size;
$zsync_block_size = $zsync->{block_size};
$zsync_hashes = $zsync->digest;
}
$schema->resultset('Hash')->store($file_id, $mtime, $size, $dmd5->hexdigest, $d1->hexdigest, $d256->hexdigest, $d512->hexdigest, $block_size, $pieceshex, $zsync_lengths, $zsync_block_size, $zsync_hashes);
Expand Down
2 changes: 1 addition & 1 deletion t/lib/Dockerfile.environ.mariadb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN zypper -vvv -n install MirrorCache perl-MaxMind-DB-Reader perl-Mojolicious-P
perl-Config-IniFiles

# optional dependencies used in testing
RUN zypper -vvv -n install perl-Geo-IP2Location perl-Inline-C gcc perl-DateTime-Format-MySQL libxml2-tools
RUN zypper -vvv -n install perl-Geo-IP2Location perl-Digest-Zsync perl-DateTime-Format-MySQL libxml2-tools

# this hack is needed because old nginx versions cannot run as non-root
RUN bbe -e 's,/var/log/nginx/error.log,/tmp/log_nginx_error.log,' /usr/sbin/nginx > /usr/sbin/nginx.hacked
Expand Down
2 changes: 1 addition & 1 deletion t/lib/Dockerfile.environ.mariadb.experimental
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN zypper -vvv -n install MirrorCache perl-MaxMind-DB-Reader perl-Mojolicious-P
perl-Config-IniFiles

# optional dependencies used in testing
RUN zypper -vvv -n install perl-Geo-IP2Location perl-Inline-C gcc perl-DateTime-Format-MySQL libxml2-tools
RUN zypper -vvv -n install perl-Geo-IP2Location perl-Digest-Zsync perl-DateTime-Format-MySQL libxml2-tools

RUN zypper -vvv -n install MariaDB-server-compat MariaDB-client-compat

Expand Down
2 changes: 1 addition & 1 deletion t/lib/Dockerfile.environ.postgresql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN zypper -vvv -n install MirrorCache perl-MaxMind-DB-Reader perl-Mojolicious-P
apache2 perl-Digest-MD4 tidy nginx bbe perl-DateTime-HiRes perl-Config-IniFiles

# optional dependencies used in testing
RUN zypper -vvv -n install perl-Geo-IP2Location perl-Inline-C gcc libxml2-tools
RUN zypper -vvv -n install perl-Geo-IP2Location perl-Digest-Zsync libxml2-tools

# this hack is needed because old nginx versions cannot run as non-root
RUN bbe -e 's,/var/log/nginx/error.log,/tmp/log_nginx_error.log,' /usr/sbin/nginx > /usr/sbin/nginx.hacked
Expand Down
Loading