From 9d332d8ac2a80317978dc800758747b5781ded1a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 14 Oct 2008 13:49:17 +0000
Subject: - urpmi.update:   o handle --nocheck:     it allows "mv
 /etc/urpmi/urpmi.cfg.{backup,} ; urpmi.update -a --nocheck"

(partial backport from trunk)
---
 NEWS          | 4 ++++
 urpm/args.pm  | 1 +
 urpm/media.pm | 8 ++++----
 urpmi.update  | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 36ba1949..c395d86c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- urpmi.update:
+  o handle --nocheck:
+    it allows "mv /etc/urpmi/urpmi.cfg.{backup,} ; urpmi.update -a --nocheck"
+
 Version 5.19.6 - 14 October 2008, by Pascal "Pixel" Rigaux
 
 - urpmi.addmedia:
diff --git a/urpm/args.pm b/urpm/args.pm
index 83561845..30abf623 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -323,6 +323,7 @@ my %options_spec = (
 	'noa|d' => \my $_dummy, #- default, kept for compatibility
 	'norebuild!' => sub { $urpm->{options}{'build-hdlist-on-error'} = !$_[1]; $options{force} = 0 },
 	'probe-rpms' => sub { $options{probe_with} = 'rpms' },
+	'nocheck' => \$options{nocheck},
 	'<>' => sub {
 	    my ($p) = @_;
 	    if ($p =~ /^--?(.+)/) { # unrecognized option
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);
 
diff --git a/urpmi.update b/urpmi.update
index 6c2e6e83..76844f53 100755
--- a/urpmi.update
+++ b/urpmi.update
@@ -67,7 +67,7 @@ if ($< != 0) {
     $urpm->{fatal}(1, N("Only superuser is allowed to update media"));
 }
 my $_urpmi_lock = urpm::lock::urpmi_db($urpm, 'exclusive', wait => $options{wait_lock});
-urpm::media::read_config($urpm);
+urpm::media::read_config($urpm, $options{nocheck});
 
 my @entries = map { $_->{name} } @{$urpm->{media}};
 
-- 
cgit v1.2.1