summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-12-01 15:14:37 +0000
committerThierry Vignaud <tv@mandriva.org>2008-12-01 15:14:37 +0000
commitc43c7654b45e8b10077572e57093ea4411a1d83c (patch)
treec31a308a291bcadd73e615c50c73887718ae4fd6
parent9d834c68ad0a2e24a1bd2d015506ec4f65870360 (diff)
downloadmgaonline-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--NEWS2
-rwxr-xr-xmdkapplet2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6c565ac0..6933717f 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/mdkapplet b/mdkapplet
index 34cf975b..5d05e48c 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -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() {