Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sypper for openSUSE:Factory checked in at 2024-04-23 18:56:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sypper (Old) and /work/SRC/openSUSE:Factory/.sypper.new.27645 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sypper" Tue Apr 23 18:56:19 2024 rev:2 rq:1169692 version:0.06 Changes: -------- --- /work/SRC/openSUSE:Factory/sypper/sypper.changes 2024-03-25 21:08:57.518858295 +0100 +++ /work/SRC/openSUSE:Factory/.sypper.new.27645/sypper.changes 2024-04-23 18:56:46.731989094 +0200 @@ -1,0 +2,6 @@ +Mon Apr 22 14:04:51 UTC 2024 - Andrii Nikitin <[email protected]> + +- Update to version 0.06: + * Avoid double slash after baseurl + +------------------------------------------------------------------- Old: ---- sypper-0.05.obscpio New: ---- sypper-0.06.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sypper.spec ++++++ --- /var/tmp/diff_new_pack.5NINOK/_old 2024-04-23 18:56:47.356011641 +0200 +++ /var/tmp/diff_new_pack.5NINOK/_new 2024-04-23 18:56:47.356011641 +0200 @@ -14,7 +14,7 @@ # with this program; if not, see <http://www.gnu.org/licenses/>. Name: sypper -Version: 0.05 +Version: 0.06 Release: 0 License: GPL-2.0-or-later Summary: Simple perl utility emulating zypper download ++++++ sypper-0.05.obscpio -> sypper-0.06.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sypper-0.05/lib/Sypp/Repo.pm new/sypper-0.06/lib/Sypp/Repo.pm --- old/sypper-0.05/lib/Sypp/Repo.pm 2024-03-14 15:31:16.000000000 +0100 +++ new/sypper-0.06/lib/Sypp/Repo.pm 2024-04-22 12:32:18.000000000 +0200 @@ -57,6 +57,10 @@ if (my $urls = $self->baseurl) { @urls = split /[;,\s]+/, $urls; } + # add trailing space if needed + for my $url (@urls) { + $url = $url . '/' unless $url && '/' eq substr $url, -1; + } @{$self->urls} = @urls; @{$self->mirrors} = @urls; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sypper-0.05/lib/Sypp.pm new/sypper-0.06/lib/Sypp.pm --- old/sypper-0.05/lib/Sypp.pm 2024-03-14 15:31:16.000000000 +0100 +++ new/sypper-0.06/lib/Sypp.pm 2024-04-22 12:32:18.000000000 +0200 @@ -166,6 +166,8 @@ if (open(my $fh, '<', $mirrorsfile)) { while(my $line = <$fh>) { chomp $line; + $line = $line . '/'; + $line =~ s!//$!/!; push @moremirrors, $line; } } else { @@ -252,7 +254,7 @@ shift @allgood; return Mojo::IOLoop->reset; } - $url = $url . '/repodata/repomd.xml'; + $url = $url . 'repodata/repomd.xml'; print STDERR "[I$ii] trying $url\n" if $self->verbosity; return $ua->get_p($url)->then($then_repomd, $catch); }; @@ -303,13 +305,13 @@ return unless $repo && $repo->{handle} && $baseurl; my ($p_primary, $p_update, $p_meta); unless ($filename2) { - print STDERR "[I$ii] trying $baseurl/$filename1\n" if $self->verbosity; - $p_primary = $ua->get_p( $baseurl . '/' . $filename1)->then($wrap1, $catch_primary)->then($wrap, $catch_primary); + print STDERR "[I$ii] trying $baseurl$filename1\n" if $self->verbosity; + $p_primary = $ua->get_p( $baseurl . $filename1)->then($wrap1, $catch_primary)->then($wrap, $catch_primary); } else { - print STDERR "[I$ii] trying $baseurl/$filename1\n" if $self->verbosity; - $p_primary = $ua->get_p( $baseurl . '/' . $filename1)->then($wrap1); - print STDERR "[I$ii] trying $baseurl/$filename2\n" if $self->verbosity; - $p_update = $ua->get_p( $baseurl . '/' . $filename2)->then($wrap1); + print STDERR "[I$ii] trying $baseurl$filename1\n" if $self->verbosity; + $p_primary = $ua->get_p( $baseurl . $filename1)->then($wrap1); + print STDERR "[I$ii] trying $baseurl$filename2\n" if $self->verbosity; + $p_update = $ua->get_p( $baseurl . $filename2)->then($wrap1); $p_meta = Mojo::Promise->all($p_primary, $p_update)->then($wrap, $catch_primary); } }; @@ -530,8 +532,7 @@ next unless $p; $nothingtodo = 0; my $url = shift @urls; - - $url = $url . '/' . $location; + $url = $url . $location; my $ua = Mojo::UserAgent->new->request_timeout(300)->connect_timeout(4)->max_redirects(10); my ($next, $then, $catch); my $started = time(); @@ -548,7 +549,7 @@ shift @allgood; return Mojo::IOLoop->reset; } - $url = $url . '/' . $location; + $url = $url . $location; $started = time(); print STDERR "[I$ii] trying $url\n" if $self->verbosity; return $ua->get_p($url)->then($then, $catch); ++++++ sypper.obsinfo ++++++ --- /var/tmp/diff_new_pack.5NINOK/_old 2024-04-23 18:56:47.640021903 +0200 +++ /var/tmp/diff_new_pack.5NINOK/_new 2024-04-23 18:56:47.644022047 +0200 @@ -1,5 +1,5 @@ name: sypper -version: 0.05 -mtime: 1710426676 -commit: 7cdb7638c0827771463176cadf8b19ce740c764e +version: 0.06 +mtime: 1713781938 +commit: f126e6fa7f9a17339e5a32576c7544dfb0a0f43c
