/[smeserver]/rpms/smeserver-yum/sme10/smeserver-yum-2.6.0.bz11227-eolvault.patch
ViewVC logotype

Contents of /rpms/smeserver-yum/sme10/smeserver-yum-2.6.0.bz11227-eolvault.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Thu Dec 3 22:26:35 2020 UTC (3 years, 10 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-yum-2_6_0-60_el7_sme, smeserver-yum-2_6_0-39_el7_sme, smeserver-yum-2_6_0-48_el7_sme, smeserver-yum-2_6_0-46_el7_sme, smeserver-yum-2_6_0-52_el7_sme, smeserver-yum-2_6_0-62_el7_sme, smeserver-yum-2_6_0-49_el7_sme, smeserver-yum-2_6_0-44_el7_sme, smeserver-yum-2_6_0-47_el7_sme, smeserver-yum-2_6_0-51_el7_sme, smeserver-yum-2_6_0-45_el7_sme, smeserver-yum-2_6_0-40_el7_sme, smeserver-yum-2_6_0-50_el7_sme, smeserver-yum-2_6_0-61_el7_sme, smeserver-yum-2_6_0-64_el7_sme, smeserver-yum-2_6_0-58_el7_sme, smeserver-yum-2_6_0-55_el7_sme, smeserver-yum-2_6_0-41_el7_sme, smeserver-yum-2_6_0-57_el7_sme, smeserver-yum-2_6_0-54_el7_sme, smeserver-yum-2_6_0-42_el7_sme, smeserver-yum-2_6_0-56_el7_sme, smeserver-yum-2_6_0-53_el7_sme, smeserver-yum-2_6_0-43_el7_sme, smeserver-yum-2_6_0-59_el7_sme, smeserver-yum-2_6_0-63_el7_sme
* Thu Dec 03 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-39.sme
- fix switch to vault BaseURL for CentOS [SME: 11227]

1 diff -Nur smeserver-yum-2.6.0.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL smeserver-yum-2.6.0/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL
2 --- smeserver-yum-2.6.0.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL 2020-12-03 17:17:44.568000000 -0500
3 +++ smeserver-yum-2.6.0/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL 2020-12-03 17:21:53.177000000 -0500
4 @@ -4,17 +4,22 @@
5 #get CentOS release we are
6 my $SUBVER = read_file('/etc/centos-release');
7 $SUBVER =~ s/^CentOS Linux release ([0-9\.]+).*?$/$1/;
8 - return unless $1;
9 + chomp $SUBVER;
10 + $SUBVER = $yum{eolversion} || $SUBVER ;
11 + return unless $SUBVER ne "";
12 my $curdate = strftime '%Y%m%d', localtime;
13 # return unless EOL is reached
14 return unless ( "$curdate" >= "20240630");
15 - for my $name ( qw(base updates centosplus extras fasttrack) )
16 + for my $name ( qw(base updates centosplus extras fasttrack centos-sclo-rh centos-sclo-centos) )
17 {
18 my $repo = $DB->get($name) or next;
19 my $rname = ( $name eq 'base' )? 'os' :$name;
20 + my $sclo = "";
21 + $sclo = "rh/" if $name eq "centos-sclo-rh";
22 + $sclo = "sclo/" if $name eq "centos-sclo-centos";
23 # setprop BaseURL "http://vault.centos.org/$SUBVER/$rname/\$basearch/"
24 - $repo->set_prop('BaseURL', "http://vault.centos.org/$SUBVER/$rname/\$basearch/");
25 + $repo->set_prop('BaseURL', "http://vault.centos.org/$SUBVER/$rname/\$basearch/$sclo");
26 # delprop MirrorList
27 - $repo->delete_prop('MirrorList');
28 + $repo->set_prop('MirrorList', "disabled");
29 }
30 }
31 diff -Nur smeserver-yum-2.6.0.old/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories smeserver-yum-2.6.0/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories
32 --- smeserver-yum-2.6.0.old/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories 2020-12-03 17:17:44.543000000 -0500
33 +++ smeserver-yum-2.6.0/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories 2020-12-03 17:22:37.869000000 -0500
34 @@ -15,13 +15,13 @@
35 $OUT .= "enabled=" . (($repos->prop('status') eq 'enabled') ? 1 : 0)
36 . "\n";
37
38 - if ( exists $props{MirrorList} )
39 + if ( ! exists $props{MirrorList} or $props{MirrorList} eq "disabled" )
40 {
41 - $OUT .= 'mirrorlist=' . $props{MirrorList} . "\n";
42 + $OUT .= 'baseurl=' . $props{BaseURL} . "\n";
43 }
44 else
45 {
46 - $OUT .= 'baseurl=' . $props{BaseURL} . "\n";
47 + $OUT .= 'mirrorlist=' . $props{MirrorList} . "\n";
48 }
49
50 for my $prop (qw(Name))

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed