--- builds_bin/update_repos 2019/02/08 06:26:53 1.91 +++ builds_bin/update_repos 2020/06/14 05:54:38 1.92 @@ -24,7 +24,7 @@ $opts{r} ||= ''; my $rpm_flags = RPM2->vsf_nodsaheader | RPM2->vsf_norsaheader | RPM2->vsf_nodsa | RPM2->vsf_norsa; -my $osdir = 'SME'; +my $osdir = 'Packages'; my $disttag = 'sme'; my $repotag = 'sme'; @@ -95,6 +95,8 @@ my $repos = { "${repotag}os" # list here the path on our local mirror to each upstream and our mirrors # ~A will be expanded to architecture # ~C will be expanded to Centos main version number, i.e. 7 for SME 10. +# ~s will be expanded to SME version +# ~S expanded to repo root my $baserepo = { "~S${repotag}os/~A/" => "${repotag}os", "~S${repotag}updates/~A/" => "${repotag}updates", "~S${repotag}updates-testing/~A/" => "${repotag}updates-testing", @@ -570,7 +572,7 @@ foreach my $ver ( sort { $a <=> $b } key my $checksum = "--checksum $distrepo->{$ver}->{checksum}"; my $exclude = ""; - $exclude .= " --exclude ${osdir}/*" if -d "$dir/Packages"; + $exclude .= " --exclude ${osdir}/*" if ( -d "$dir/Packages" && ${osdir} ne "Packages" ); $exclude .= " --exclude *smeserver-release*.rpm" if $dir =~ m{test/|-testing/}; my $groupfile = "";