Mageia Bugzilla – Attachment 177 Details for
Bug 201
show error on invalid media.cfg
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
new patch for MDV::Distribconf
mdv-distribconf2.patch (text/plain), 733 bytes, created by
AL13N
on 2011-03-31 21:34:06 CEST
(
hide
)
Description:
new patch for MDV::Distribconf
Filename:
MIME Type:
Creator:
AL13N
Created:
2011-03-31 21:34:06 CEST
Size:
733 bytes
patch
obsolete
>--- MDV/Distribconf.pm.old 2011-03-31 19:50:35.477207294 +0200 >+++ MDV/Distribconf.pm 2011-03-31 19:49:07.874207027 +0200 >@@ -383,6 +383,12 @@ > ($distrib->{cfg} = new Config::IniFiles( -file => $mediacfg, -default => 'media_info', -allowcontinue => 1)) > or return 0; > >+ my $mediacfg_version = $distrib->{cfg}->val('media_info', 'mediacfg_version'); >+ if ($mediacfg_version =~ m/[\r\n]/) { >+ print STDERR N("WARNING: Duplicate mediacfg_version in [media_info] section of media.cfg.\n"); >+ $mediacfg_version =~ s/[\r\n]+.*$//; >+ $distrib->{cfg}->newval('media_info', 'mediacfg_version', $mediacfg_version); >+ } > return $distrib->check_mediacfg_version(mymediacfg_version()); > } >
--- MDV/Distribconf.pm.old 2011-03-31 19:50:35.477207294 +0200 +++ MDV/Distribconf.pm 2011-03-31 19:49:07.874207027 +0200 @@ -383,6 +383,12 @@ ($distrib->{cfg} = new Config::IniFiles( -file => $mediacfg, -default => 'media_info', -allowcontinue => 1)) or return 0; + my $mediacfg_version = $distrib->{cfg}->val('media_info', 'mediacfg_version'); + if ($mediacfg_version =~ m/[\r\n]/) { + print STDERR N("WARNING: Duplicate mediacfg_version in [media_info] section of media.cfg.\n"); + $mediacfg_version =~ s/[\r\n]+.*$//; + $distrib->{cfg}->newval('media_info', 'mediacfg_version', $mediacfg_version); + } return $distrib->check_mediacfg_version(mymediacfg_version()); }
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 201
:
62
|
63
|
92
|
93
|
177
|
1446