Attachment 481921 Details for Bug 646843 – lazy-fix.patch

[patch] lazy-fix.patch

lazy.patch (text/plain), 1.39 KB, created by James Laska on 2011-03-02 18:03:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Laska

Created: 2011-03-02 18:03:42 UTC

Size: 1.39 KB

patch

obsolete

>diff --git a/preupgrade-gtk.py b/preupgrade-gtk.py
>index 4ed9a41..a930c7f 100755
>--- a/preupgrade-gtk.py
>+++ b/preupgrade-gtk.py
>@@ -490,17 +490,21 @@ class PreUpgradeGtk(PreUpgradeController):
> 
>         # Try to download stage2.img and write kickstart to /boot
>         extra_args = ""
>-        try:
>-            # TODO: make generate_kickstart cram the kickstart into initrd, so
>-            # /boot-less upgrades can still be automated
>-            # generate a kickstart file to automate the installation
>-            extra_args += " ks=%s" % self.pu.generate_kickstart()
> 
>+        # TODO: make generate_kickstart cram the kickstart into initrd, so
>+        # /boot-less upgrades can still be automated
>+        # generate a kickstart file to automate the installation
>+        extra_args += " ks=%s" % self.pu.generate_kickstart()
>+
>+        try:
>             # download stage2.img
>             stage2file = self.pu.retrieve_non_critical_files()
>             stage2_abs = self.pu.bootpath+"/"+stage2file
>             bootdevpath = bootpath_to_anacondapath(stage2_abs, UUID=True)
>             extra_args += " stage2=%s" % bootdevpath
>+        except URLGrabError, e:
>+            message = "Error: unable to download installation image\n%s\n\n" % str(e)
>+            print message
>         except PUError, e:
>             # TODO: offer to create CD/copy stage2 to USB. bluh.
>             message = str(e) + "\n\n"

Actions: View | Diff

Attachments on bug 646843: 481921 | 481922 | 484187