Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package MirrorCache for openSUSE:Factory
checked in at 2022-03-23 20:19:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/MirrorCache (Old)
and /work/SRC/openSUSE:Factory/.MirrorCache.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MirrorCache"
Wed Mar 23 20:19:25 2022 rev:11 rq:964343 version:1.027
Changes:
--------
--- /work/SRC/openSUSE:Factory/MirrorCache/MirrorCache.changes 2022-03-16
20:21:48.845028418 +0100
+++ /work/SRC/openSUSE:Factory/.MirrorCache.new.25692/MirrorCache.changes
2022-03-23 20:21:16.478561074 +0100
@@ -1,0 +2,8 @@
+Wed Mar 16 16:40:33 UTC 2022 - Andrii Nikitin <andrii.niki...@suse.com>
+
+- Update to version 1.027:
+ * Fix auto-disabled mirrors may be still used for redirection (#261)
+ * Increase logging level for timeouts in PEDANTIC mode (#261)
+ * Serve CentOS repodata from root only (#261)
+
+-------------------------------------------------------------------
Old:
----
MirrorCache-1.026.obscpio
New:
----
MirrorCache-1.027.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MirrorCache.spec ++++++
--- /var/tmp/diff_new_pack.clR3L3/_old 2022-03-23 20:21:17.010561375 +0100
+++ /var/tmp/diff_new_pack.clR3L3/_new 2022-03-23 20:21:17.014561378 +0100
@@ -22,7 +22,7 @@
%define main_requires %{assetpack_requires} perl(Carp) perl(DBD::Pg) >= 3.7.4
perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801
perl(DBIx::Class::DynamicDefault) perl(DateTime) perl(Encode) perl(Time::Piece)
perl(Time::Seconds) perl(Time::ParseDate) perl(DateTime::Format::Pg)
perl(Exporter) perl(File::Basename) perl(LWP::UserAgent) perl(Mojo::Base)
perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg)
perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands)
perl(Mojolicious::Plugin) perl(Mojolicious::Plugin::RenderFile)
perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX)
perl(Sort::Versions) perl(URI::Escape) perl(XML::Writer) perl(base)
perl(constant) perl(diagnostics) perl(strict) perl(warnings) shadow
rubygem(sass) perl(Net::DNS) perl(LWP::Protocol::https) perl(Digest::SHA)
%define build_requires %{assetpack_requires} rubygem(sass) tidy sysuser-shadow
sysuser-tools
Name: MirrorCache
-Version: 1.026
+Version: 1.027
Release: 0
Summary: WebApp to redirect and manage mirrors
License: GPL-2.0-or-later
++++++ MirrorCache-1.026.obscpio -> MirrorCache-1.027.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.026/lib/MirrorCache/Datamodule.pm
new/MirrorCache-1.027/lib/MirrorCache/Datamodule.pm
--- old/MirrorCache-1.026/lib/MirrorCache/Datamodule.pm 2022-03-08
11:08:06.000000000 +0100
+++ new/MirrorCache-1.027/lib/MirrorCache/Datamodule.pm 2022-03-16
15:24:45.000000000 +0100
@@ -394,7 +394,7 @@
if !$self->mirrorlist
&& ( !$self->metalink || $self->metalink_accept )
&& !$self->zsync
- && $path =~
m/.*\/(repodata\/repomd.xml[^\/]*|media\.1\/media|.*\.sha256(\.asc)|Release(.key|.gpg)?|InRelease|Packages(.gz)?|Sources(.gz)?|.*_Arch\.(files|db|key)(\.(sig|tar\.gz(\.sig)?)?))$/;
+ && $path =~
m/.*\/(repodata\/repomd.xml[^\/]*|media\.1\/media|.*\.sha256(\.asc)|Release(.key|.gpg)?|InRelease|Packages(.gz)?|Sources(.gz)?|.*_Arch\.(files|db|key)(\.(sig|tar\.gz(\.sig)?))?|(files|primary|other).xml.gz)$/;
$self->_path($path);
$self->_trailing_slash($trailing_slash);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MirrorCache-1.026/lib/MirrorCache/Schema/ResultSet/Server.pm
new/MirrorCache-1.027/lib/MirrorCache/Schema/ResultSet/Server.pm
--- old/MirrorCache-1.026/lib/MirrorCache/Schema/ResultSet/Server.pm
2022-03-08 11:08:06.000000000 +0100
+++ new/MirrorCache-1.027/lib/MirrorCache/Schema/ResultSet/Server.pm
2022-03-16 15:24:45.000000000 +0100
@@ -78,11 +78,11 @@
my $capabilityx = $capability eq 'http'? 'https' : 'http';
my $extra = '';
if ($schemastrict && $ipvstrict) {
- $extra = "WHERE support_scheme > 0 and support_ipv > 0";
+ $extra = "AND support_scheme > 0 and support_ipv > 0";
} elsif ($schemastrict) {
- $extra = "WHERE support_scheme > 0";
+ $extra = "AND support_scheme > 0";
} elsif ($ipvstrict) {
- $extra = "WHERE support_ipv > 0";
+ $extra = "AND support_ipv > 0";
}
my $hostname = $vpn? "CASE WHEN length(s.hostname_vpn)>0 THEN
s.hostname_vpn ELSE s.hostname END" : "s.hostname";
@@ -107,6 +107,7 @@
end as dist,
s.country, s.region, s.score,
CASE WHEN COALESCE(stability_scheme.rating, 0) > 0 OR
COALESCE(stability_schemex.rating, 0) = 0 THEN 1 ELSE 0 END AS support_scheme,
-- we show here 0 only when opposite scheme is supported
+CASE WHEN COALESCE(stability_scheme.rating, 0) > 0 OR
COALESCE(stability_schemex.rating, 0) = 0 THEN ( scf.capability is NULL AND
COALESCE(scd.enabled, 't') = 't' ) ELSE ( scf2.capability is NULL AND
COALESCE(scd2.enabled, 't') = 't' ) END AS not_disabled,
CASE WHEN COALESCE(stability_scheme.rating, 0) > 0 THEN
stability_scheme.rating WHEN COALESCE(stability_schemex.rating, 0) > 0 THEN
stability_schemex.rating ELSE 0 END AS rating_scheme,
CASE WHEN COALESCE(stability_ipv.rating, 0) > 0 THEN 1 ELSE 0 END AS
support_ipv,
CASE WHEN COALESCE(stability_ipv.rating, 0) > 0 THEN stability_ipv.rating
WHEN COALESCE(stability_ipvx.rating, 0) > 0 THEN stability_ipvx.rating
ELSE 0 END AS rating_ipv
@@ -129,7 +130,7 @@
left join server_stability stability_ipv on s.id = stability_ipv.server_id
and stability_ipv.capability = '$ipv'
left join server_stability stability_ipvx on s.id =
stability_ipvx.server_id and stability_ipvx.capability = '$ipvx'
) x
-$extra
+WHERE not_disabled $extra
order by rating_country desc, (dist/100)::int, support_scheme desc,
rating_scheme desc, support_ipv desc, rating_ipv desc, score, random()
limit (case when $limit > 10 then $limit+$limit else 10 end)
) xx
@@ -200,7 +201,7 @@
sp.server_id as mirror_id,
coalesce(sp.state, -2) oldstate
from project p
- join server s on s.enabled
+ join server s on s.enabled
left join server_project sp on sp.server_id = s.id and sp.project_id = p.id
where 't'
AND coalesce(sp.state,0) > -1
@@ -219,7 +220,7 @@
insert into server_project(state, extra, dt, server_id, project_id)
values (?, ?, now(), ?, ?);
END_SQL
-
+
if ($mirror_id) {
$sql = <<'END_SQL';
update server_project set state = ?, extra = ?, dt = now()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MirrorCache-1.026/lib/MirrorCache/Schema/ResultSet/Stat.pm
new/MirrorCache-1.027/lib/MirrorCache/Schema/ResultSet/Stat.pm
--- old/MirrorCache-1.026/lib/MirrorCache/Schema/ResultSet/Stat.pm
2022-03-08 11:08:06.000000000 +0100
+++ new/MirrorCache-1.027/lib/MirrorCache/Schema/ResultSet/Stat.pm
2022-03-16 15:24:45.000000000 +0100
@@ -133,7 +133,7 @@
where mirror_id < 1
and ( mirror_id in (0,-1) or mirrorlist )
and file_id is null
-and stat.path !~
'.*\/(repodata\/repomd.xml[^\/]*|media\.1\/media|.*\.sha256(\.asc)|Release(.key|.gpg)?|InRelease|Packages(.gz)?|Sources(.gz)?)$'
+and stat.path !~
'.*\/(repodata\/repomd.xml[^\/]*|media\.1\/media|.*\.sha256(\.asc)|Release(.key|.gpg)?|InRelease|Packages(.gz)?|Sources(.gz)?)|.*_Arch\.(files|db|key)(\.(sig|tar\.gz(\.sig)?))?|(files|primary|other).xml.gz$'
and stat.agent NOT ILIKE '%bot%'
and (
stat.folder_id is null or
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MirrorCache-1.026/lib/MirrorCache/WebAPI/Plugin/Dir.pm
new/MirrorCache-1.027/lib/MirrorCache/WebAPI/Plugin/Dir.pm
--- old/MirrorCache-1.026/lib/MirrorCache/WebAPI/Plugin/Dir.pm 2022-03-08
11:08:06.000000000 +0100
+++ new/MirrorCache-1.027/lib/MirrorCache/WebAPI/Plugin/Dir.pm 2022-03-16
15:24:45.000000000 +0100
@@ -370,7 +370,7 @@
} else {
$msg = $msg . Dumper(@_);
}
- $c->app->log->error($msg);
+ $c->app->log->fatal($msg); # it is not fatal, but needed in production
log
my $reftx = $tx;
my $refua = $ua;
})->timeout(2)->wait;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.026/t/environ/09-stability-force.sh
new/MirrorCache-1.027/t/environ/09-stability-force.sh
--- old/MirrorCache-1.026/t/environ/09-stability-force.sh 2022-03-08
11:08:06.000000000 +0100
+++ new/MirrorCache-1.027/t/environ/09-stability-force.sh 2022-03-16
15:24:45.000000000 +0100
@@ -66,7 +66,10 @@
$mc/backstage/job -e mirror_probe -a '["us"]'
$mc/backstage/shoot
-$mc/curl -I /download/folder1/file1.1.dat | grep -v $($ap7/print_address)
+rc=0
+$mc/curl -I /download/folder1/file1.1.dat | grep $($ap7/print_address) || rc=$?
+test $rc -gt 0
+
# now scan those mirrors which were force disabled
$mc/backstage/job -e mirror_force_ups
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.026/t/environ/09-stability-force2.sh
new/MirrorCache-1.027/t/environ/09-stability-force2.sh
--- old/MirrorCache-1.026/t/environ/09-stability-force2.sh 2022-03-08
11:08:06.000000000 +0100
+++ new/MirrorCache-1.027/t/environ/09-stability-force2.sh 2022-03-16
15:24:45.000000000 +0100
@@ -71,7 +71,9 @@
$mc/backstage/job -e mirror_probe -a '["us"]'
$mc/backstage/shoot
-$mc/curl -I /download/folder1/file1.1.dat | grep -v $($ap7/print_address)
+rc=0
+$mc/curl -I /download/folder1/file1.1.dat | grep $($ap7/print_address) || rc=$?
+test $rc -gt 0
# now scan those mirrors which were force disabled
$mc/backstage/job -e mirror_force_ups
++++++ MirrorCache.obsinfo ++++++
--- /var/tmp/diff_new_pack.clR3L3/_old 2022-03-23 20:21:17.302561540 +0100
+++ /var/tmp/diff_new_pack.clR3L3/_new 2022-03-23 20:21:17.310561545 +0100
@@ -1,5 +1,5 @@
name: MirrorCache
-version: 1.026
-mtime: 1646734086
-commit: 5d9a1dc1a57882ca2742876fa162f5eda91200c1
+version: 1.027
+mtime: 1647440685
+commit: 03f526436269ca999368a284b236f05f2eee2599
++++++ _service ++++++
--- /var/tmp/diff_new_pack.clR3L3/_old 2022-03-23 20:21:17.342561563 +0100
+++ /var/tmp/diff_new_pack.clR3L3/_new 2022-03-23 20:21:17.346561565 +0100
@@ -1,10 +1,10 @@
<services>
- <service name="obs_scm" mode="manual">
+ <service name="obs_scm" mode="manual">
<param name="extract">dist/rpm/MirrorCache.spec</param>
<param name="extract">dist/rpm/MirrorCache-user.conf</param>
<param name="extract">dist/rpm/MirrorCache-tmpfilesd.conf</param>
<param name="extract">dist/rpm/update-cache.sh</param>
- <param name="url">git://github.com/openSUSE/MirrorCache.git</param>
+ <param name="url">https://github.com/openSUSE/MirrorCache</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="revision">@PARENT_TAG@</param>
<param name="scm">git</param>
