diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-10-14 13:53:17 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-10-14 13:53:17 +0000 |
commit | e1ff70c76947a95f6336625a3d77299158e71f4c (patch) | |
tree | 7c4ca0097f24202d8dffd907aee205ec433552ad | |
parent | a78eb84d501c836f3d7ea0ddb7ace76ac39feaef (diff) | |
download | urpmi-e1ff70c76947a95f6336625a3d77299158e71f4c.tar urpmi-e1ff70c76947a95f6336625a3d77299158e71f4c.tar.gz urpmi-e1ff70c76947a95f6336625a3d77299158e71f4c.tar.bz2 urpmi-e1ff70c76947a95f6336625a3d77299158e71f4c.tar.xz urpmi-e1ff70c76947a95f6336625a3d77299158e71f4c.zip |
- urpmi.update:
o handle --nocheck:
it allows "mv /etc/urpmi/urpmi.cfg.{backup,} ; urpmi.update -a --nocheck"
(partial backport from trunk)
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | urpm/args.pm | 1 | ||||
-rw-r--r-- | urpm/media.pm | 8 | ||||
-rwxr-xr-x | urpmi.update | 2 |
4 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,7 @@ +- urpmi.update: + o handle --nocheck: + it allows "mv /etc/urpmi/urpmi.cfg.{backup,} ; urpmi.update -a --nocheck" + Version 6.14.3 - 13 October 2008 - aria2: diff --git a/urpm/args.pm b/urpm/args.pm index 2e590b23..8d1fe44c 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -329,6 +329,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 c8c3428b..5372d170 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -155,7 +155,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}) @@ -189,7 +189,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) }; } @@ -234,7 +234,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})); @@ -246,7 +246,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 b27f7fba..87ef1ebb 100755 --- a/urpmi.update +++ b/urpmi.update @@ -69,7 +69,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 @chosen_media; |