Mageia Bugzilla – Attachment 2466 Details for
Bug 2317
--update option should behave like --search-media <list of the update media>
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
rpmdrake-only-full-sources.patch
rpmdrake-only-full-sources.patch (text/plain), 2.18 KB, created by
AL13N
on 2012-06-15 23:19:01 CEST
(
hide
)
Description:
rpmdrake-only-full-sources.patch
Filename:
MIME Type:
Creator:
AL13N
Created:
2012-06-15 23:19:01 CEST
Size:
2.18 KB
patch
obsolete
>Index: Rpmdrake/edit_urpm_sources.pm >=================================================================== >--- Rpmdrake/edit_urpm_sources.pm (revision 4900) >+++ Rpmdrake/edit_urpm_sources.pm (working copy) >@@ -109,27 +109,11 @@ > > } > >-sub _want_base_distro() { >- distro_type(0) eq 'updates' ? interactive_msg( >- N("Choose media type"), >-N("In order to keep your system secure and stable, you must at a minimum set up >-sources for official security and stability updates. You can also choose to set >-up a fuller set of sources which includes the complete official Mageia >-repositories, giving you access to more software than can fit on the Mageia >-discs. Please choose whether to configure update sources only, or the full set >-of sources."), >- transient => $::main_window, >- yesno => 1, text => { yes => N("Full set of sources"), no => N("Update sources only") }, >- ) : 1; >-} >- > sub easy_add_callback_with_mirror() { > # when called on early init by rpmdrake > $urpm ||= fast_open_urpmi_db(); > > #- cooker and community don't have update sources >- my $want_base_distro = _want_base_distro(); >- defined $want_base_distro or return; > my $distro = $rpmdrake::mandrake_release; > my ($mirror) = choose_mirror($urpm, message => > N("This will attempt to install all official sources corresponding to your >@@ -143,7 +127,7 @@ > ) or return 0; > ref $mirror or return; > my $wait = wait_msg(N("Please wait, adding media...")); >- add_distrib_update_media($urpm, $mirror, if_(!$want_base_distro, only_updates => 1)); >+ add_distrib_update_media($urpm, $mirror); > $offered_to_add_sources->[0] = 1; > remove_wait_msg($wait); > return 1; >@@ -154,11 +138,9 @@ > $urpm ||= fast_open_urpmi_db(); > > #- cooker and community don't have update sources >- my $want_base_distro = _want_base_distro(); >- defined $want_base_distro or return; > warn_for_network_need(undef, transient => $::main_window) or return; > my $wait = wait_msg(N("Please wait, adding media...")); >- add_distrib_update_media($urpm, undef, if_(!$want_base_distro, only_updates => 1)); >+ add_distrib_update_media($urpm, undef); > $offered_to_add_sources->[0] = 1; > remove_wait_msg($wait); > return 1;
Index: Rpmdrake/edit_urpm_sources.pm =================================================================== --- Rpmdrake/edit_urpm_sources.pm (revision 4900) +++ Rpmdrake/edit_urpm_sources.pm (working copy) @@ -109,27 +109,11 @@ } -sub _want_base_distro() { - distro_type(0) eq 'updates' ? interactive_msg( - N("Choose media type"), -N("In order to keep your system secure and stable, you must at a minimum set up -sources for official security and stability updates. You can also choose to set -up a fuller set of sources which includes the complete official Mageia -repositories, giving you access to more software than can fit on the Mageia -discs. Please choose whether to configure update sources only, or the full set -of sources."), - transient => $::main_window, - yesno => 1, text => { yes => N("Full set of sources"), no => N("Update sources only") }, - ) : 1; -} - sub easy_add_callback_with_mirror() { # when called on early init by rpmdrake $urpm ||= fast_open_urpmi_db(); #- cooker and community don't have update sources - my $want_base_distro = _want_base_distro(); - defined $want_base_distro or return; my $distro = $rpmdrake::mandrake_release; my ($mirror) = choose_mirror($urpm, message => N("This will attempt to install all official sources corresponding to your @@ -143,7 +127,7 @@ ) or return 0; ref $mirror or return; my $wait = wait_msg(N("Please wait, adding media...")); - add_distrib_update_media($urpm, $mirror, if_(!$want_base_distro, only_updates => 1)); + add_distrib_update_media($urpm, $mirror); $offered_to_add_sources->[0] = 1; remove_wait_msg($wait); return 1; @@ -154,11 +138,9 @@ $urpm ||= fast_open_urpmi_db(); #- cooker and community don't have update sources - my $want_base_distro = _want_base_distro(); - defined $want_base_distro or return; warn_for_network_need(undef, transient => $::main_window) or return; my $wait = wait_msg(N("Please wait, adding media...")); - add_distrib_update_media($urpm, undef, if_(!$want_base_distro, only_updates => 1)); + add_distrib_update_media($urpm, undef); $offered_to_add_sources->[0] = 1; remove_wait_msg($wait); return 1;
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 2317
:
2432
| 2466 |
2467
|
2517
|
2524
|
2836