diff options
| author | Angelo Naselli <anaselli@linux.it> | 2014-07-20 19:33:20 +0200 |
|---|---|---|
| committer | Angelo Naselli <anaselli@linux.it> | 2014-07-20 19:33:20 +0200 |
| commit | 89cd794235a1a02ee6d71d2e44bdc719fa56f03f (patch) | |
| tree | 847a759117ec10c4c549ebd157bda0e994a7c4a8 /lib/AdminPanel | |
| parent | 7758e0003582dede4e63bd7dd0fc42f50baec3b4 (diff) | |
| download | manatools-89cd794235a1a02ee6d71d2e44bdc719fa56f03f.tar manatools-89cd794235a1a02ee6d71d2e44bdc719fa56f03f.tar.gz manatools-89cd794235a1a02ee6d71d2e44bdc719fa56f03f.tar.bz2 manatools-89cd794235a1a02ee6d71d2e44bdc719fa56f03f.tar.xz manatools-89cd794235a1a02ee6d71d2e44bdc719fa56f03f.zip | |
return mirror only if it has been chosen
Diffstat (limited to 'lib/AdminPanel')
| -rw-r--r-- | lib/AdminPanel/rpmdragora.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/AdminPanel/rpmdragora.pm b/lib/AdminPanel/rpmdragora.pm index c3e7a9d4..ed68852c 100644 --- a/lib/AdminPanel/rpmdragora.pm +++ b/lib/AdminPanel/rpmdragora.pm @@ -868,10 +868,10 @@ sub update_sources_noninteractive { sub add_distrib_update_media { my ($urpm, $mirror, %options) = @_; - $DB::single = 1; #- ensure a unique medium name my $medium_name = $AdminPanel::rpmdragora::mageia_release =~ /(\d+\.\d+) \((\w+)\)/ ? $2 . $1 . '-' : 'distrib'; my $initial_number = 1 + max map { $_->{name} =~ /\(\Q$medium_name\E(\d+)\b/ ? $1 : 0 } @{$urpm->{media}}; + $DB::single = 1; add_medium_and_check( $urpm, { nolock => 1, distrib => 1 }, @@ -939,7 +939,7 @@ by Mageia Official Updates.")), %options list => \@mirrorlist } ); - return { url => $mirror}; + return $mirror ? { url => $mirror} : undef; } |