- urpmi.update:

  o handle --nocheck:
    it allows "mv /etc/urpmi/urpmi.cfg.{backup,} ; urpmi.update -a --nocheck"

(partial backport from trunk)

1 files changed, 4 insertions, 4 deletions

diff --git a/urpm/media.pm b/urpm/media.pm
index 230946cd..4d5873da 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -145,7 +145,7 @@ sub recover_url_from_list {
 #- Loads /etc/urpmi/urpmi.cfg and performs basic checks.
 #- Does not handle old format: <name> <url> [with <path_hdlist>]
 sub read_config {
-    my ($urpm) = @_;
+    my ($urpm, $nocheck) = @_;
     return if $urpm->{media}; #- media already loaded
     $urpm->{media} = [];
     my $config = urpm::cfg::load_config($urpm->{config})
@@ -179,7 +179,7 @@ sub read_config {
 	}
     }
 
-    add_existing_medium($urpm, $_) foreach @media;
+    add_existing_medium($urpm, $_, $nocheck) foreach @media;
 
     eval { require urpm::ldap; urpm::ldap::load_ldap_media($urpm) };
 }
@@ -224,7 +224,7 @@ sub _migrate__with_synthesis {
 
 #- probe medium to be used, take old medium into account too.
 sub add_existing_medium {
-    my ($urpm, $medium) = @_;
+    my ($urpm, $medium, $nocheck) = @_;
 
     if (name2medium($urpm, $medium->{name})) {
 	$urpm->{error}(N("trying to override existing medium \"%s\", skipping", $medium->{name}));
@@ -236,7 +236,7 @@ sub add_existing_medium {
 	$urpm->{modified} = 1;
     }
 
-    check_existing_medium($urpm, $medium);
+    check_existing_medium($urpm, $medium) if !$nocheck;
 
     _migrate_removable_device($urpm, $medium);