diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-10-14 13:49:17 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-10-14 13:49:17 +0000 |
commit | 9d332d8ac2a80317978dc800758747b5781ded1a (patch) | |
tree | 2756ff3ac61991cb7c7e5fcc5152abf2e0532db8 /urpm/media.pm | |
parent | 0a672f7ca0a1732d4fb8629fced233e7cf87574f (diff) | |
download | urpmi-9d332d8ac2a80317978dc800758747b5781ded1a.tar urpmi-9d332d8ac2a80317978dc800758747b5781ded1a.tar.gz urpmi-9d332d8ac2a80317978dc800758747b5781ded1a.tar.bz2 urpmi-9d332d8ac2a80317978dc800758747b5781ded1a.tar.xz urpmi-9d332d8ac2a80317978dc800758747b5781ded1a.zip |
- urpmi.update:
o handle --nocheck:
it allows "mv /etc/urpmi/urpmi.cfg.{backup,} ; urpmi.update -a --nocheck"
(partial backport from trunk)
Diffstat (limited to 'urpm/media.pm')
-rw-r--r-- | urpm/media.pm | 8 |
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); |