diff options
author | Thierry Vignaud <tv@mandriva.org> | 2008-12-01 15:14:37 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2008-12-01 15:14:37 +0000 |
commit | c43c7654b45e8b10077572e57093ea4411a1d83c (patch) | |
tree | c31a308a291bcadd73e615c50c73887718ae4fd6 | |
parent | 9d834c68ad0a2e24a1bd2d015506ec4f65870360 (diff) | |
download | mgaonline-c43c7654b45e8b10077572e57093ea4411a1d83c.tar mgaonline-c43c7654b45e8b10077572e57093ea4411a1d83c.tar.gz mgaonline-c43c7654b45e8b10077572e57093ea4411a1d83c.tar.bz2 mgaonline-c43c7654b45e8b10077572e57093ea4411a1d83c.tar.xz mgaonline-c43c7654b45e8b10077572e57093ea4411a1d83c.zip |
(is_restricted_media_configured) verify we have both
restricted/release & restricted/updates
-rw-r--r-- | NEWS | 2 | ||||
-rwxr-xr-x | mdkapplet | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- mdkapplet + o check we have both restricted/release & restricted/updates - mdkapplet-restricted-helper o add both newly created restricted/release & restricted/updates media @@ -699,7 +699,7 @@ sub is_restricted_media_configured { my @names = map { $_->{name} } @restricted_media; # we need both 'Restricted' & 'Restricted Updates' media # those who did online update trough mdkapplet do not have restricted medium, hence the test for 2 medium: - grep { /Restricted Updates/ } @names; + @restricted_media > 2 && (grep { /Restricted Updates/ } @names) && (grep { /Restricted/ && !/Updates/ } @names); } sub prepare_add_restricted() { |