Attachment 6638 Details for Bug 8819 – do not die if network fail to start (comment #60 to #62)

[patch] do not die if network fail to start (comment #60 to #62)

8819f.diff (text/plain), 1.09 KB, created by Thierry Vignaud on 2015-05-25 11:57:44 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2015-05-25 11:57:44 CEST

Size: 1.09 KB

patch

obsolete

>commit dc8d98a2605e93465f14a8539629fe47070b3768
>Author: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date:   Mon May 25 05:47:57 2015 -0400
>
>    die is not an option here (mga#8819)
>    
>    just log the faillure and offer to either retry or abort
>
>diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
>index 5e0c2b9..3c2b2f5 100644
>--- a/perl-install/install/steps_interactive.pm
>+++ b/perl-install/install/steps_interactive.pm
>@@ -749,6 +749,7 @@ Do you want to setup the update media?")),
> 	return;
>     };
> 
>+    try_again:
>     #- bring all interface up for installing updates packages.
>     install::interactive::upNetwork($o);
> 
>@@ -757,7 +758,12 @@ Do you want to setup the update media?")),
> 	log::l("installUpdates: successfully added media");
>     } else {
> 	log::l("installUpdates: failed to add media");
>-	die "failed to add media"
>+	if ($o->ask_okcancel(N("Warning"),
>+		N("Failure when adding medium") . "\n" . N("Retry?"))) {
>+	  goto try_again;
>+	} else {
>+	  return 0;
>+	}
>     }
> 
>     $o->ask_yesorno_({ title => N("Updates"), messages => formatAlaTeX(

commit dc8d98a2605e93465f14a8539629fe47070b3768
Author: Thierry Vignaud <thierry.vignaud@gmail.com>
Date:   Mon May 25 05:47:57 2015 -0400

    die is not an option here (mga#8819)
    
    just log the faillure and offer to either retry or abort

diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 5e0c2b9..3c2b2f5 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -749,6 +749,7 @@ Do you want to setup the update media?")),
 	return;
     };
 
+    try_again:
     #- bring all interface up for installing updates packages.
     install::interactive::upNetwork($o);
 
@@ -757,7 +758,12 @@ Do you want to setup the update media?")),
 	log::l("installUpdates: successfully added media");
     } else {
 	log::l("installUpdates: failed to add media");
-	die "failed to add media"
+	if ($o->ask_okcancel(N("Warning"),
+		N("Failure when adding medium") . "\n" . N("Retry?"))) {
+	  goto try_again;
+	} else {
+	  return 0;
+	}
     }
 
     $o->ask_yesorno_({ title => N("Updates"), messages => formatAlaTeX(

Actions: View | Diff

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