Attachment 6566 Details for Bug 8819 – add online media at installation end (mga#8819)

[patch] add online media at installation end (mga#8819)

8819c.diff (text/plain), 2.09 KB, created by Thierry Vignaud on 2015-05-17 11:07:20 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2015-05-17 11:07:20 CEST

Size: 2.09 KB

patch

obsolete

>commit 0eec92b477331bccff121d5661f8e13d95f78c18
>Author: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date:   Sun May 17 10:58:47 2015 +0200
>
>    add online media at installation end (mga#8819)
>
>diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
>index 3bbfb26..e332dbf 100644
>--- a/perl-install/install/steps_interactive.pm
>+++ b/perl-install/install/steps_interactive.pm
>@@ -737,6 +737,30 @@ sub installUpdates {
>     }
> 
>     $o->ask_yesorno_({ title => N("Updates"), messages => formatAlaTeX(
>+N("You now have the opportunity to setup online media.") . "\n\n" .
>+N("This enables to install security updates.") . "\n\n" .
>+N("To setup those media, you will need to have a working Internet 
>+connection.
>+
>+Do you want to setup the update media?")),
>+			   interactive_help_id => 'installUpdates',
>+					       }, 1) or do {
>+	log::l("installUpdates: skipping since user say no to media setup");
>+	return;
>+    };
>+
>+    #- bring all interface up for installing updates packages.
>+    install::interactive::upNetwork($o);
>+
>+    install::pkgs::clean_rpmdb_shared_regions();
>+    if (any::urpmi_add_all_media($o, $o->{previous_release})) {
>+	log::l("installUpdates: successfully added media");
>+    } else {
>+	log::l("installUpdates: failed to add media");
>+	die "failed to add media"
>+    }
>+
>+    $o->ask_yesorno_({ title => N("Updates"), messages => formatAlaTeX(
> N("You now have the opportunity to download updated packages. These packages
> have been updated after the distribution was released. They may
> contain security or bug fixes.
>@@ -751,11 +775,6 @@ Do you want to install the updates?")),
> 	return;
>     };
> 
>-    #- bring all interface up for installing updates packages.
>-    install::interactive::upNetwork($o);
>-
>-    install::pkgs::clean_rpmdb_shared_regions();
>-    if (any::urpmi_add_all_media($o, $o->{previous_release})) {
> 	my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi2'), 'urpmi' or return;
> 	my $log_file = '/root/drakx/updates.log';
> 	run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, '--auto-select');

commit 0eec92b477331bccff121d5661f8e13d95f78c18
Author: Thierry Vignaud <thierry.vignaud@gmail.com>
Date:   Sun May 17 10:58:47 2015 +0200

    add online media at installation end (mga#8819)

diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 3bbfb26..e332dbf 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -737,6 +737,30 @@ sub installUpdates {
     }
 
     $o->ask_yesorno_({ title => N("Updates"), messages => formatAlaTeX(
+N("You now have the opportunity to setup online media.") . "\n\n" .
+N("This enables to install security updates.") . "\n\n" .
+N("To setup those media, you will need to have a working Internet 
+connection.
+
+Do you want to setup the update media?")),
+			   interactive_help_id => 'installUpdates',
+					       }, 1) or do {
+	log::l("installUpdates: skipping since user say no to media setup");
+	return;
+    };
+
+    #- bring all interface up for installing updates packages.
+    install::interactive::upNetwork($o);
+
+    install::pkgs::clean_rpmdb_shared_regions();
+    if (any::urpmi_add_all_media($o, $o->{previous_release})) {
+	log::l("installUpdates: successfully added media");
+    } else {
+	log::l("installUpdates: failed to add media");
+	die "failed to add media"
+    }
+
+    $o->ask_yesorno_({ title => N("Updates"), messages => formatAlaTeX(
 N("You now have the opportunity to download updated packages. These packages
 have been updated after the distribution was released. They may
 contain security or bug fixes.
@@ -751,11 +775,6 @@ Do you want to install the updates?")),
 	return;
     };
 
-    #- bring all interface up for installing updates packages.
-    install::interactive::upNetwork($o);
-
-    install::pkgs::clean_rpmdb_shared_regions();
-    if (any::urpmi_add_all_media($o, $o->{previous_release})) {
 	my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi2'), 'urpmi' or return;
 	my $log_file = '/root/drakx/updates.log';
 	run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, '--auto-select');

Actions: View | Diff

Attachments on bug 8819: 6534 | 6535 | 6536 | 6547 | 6566 | 6579 | 6586 | 6587 | 6601 | 6638