[gnome-boxes] media-manager: Use original media if unattended setup fails



commit 9e1e8757512ae25a1a7ec3630cac36478f9a2477
Author: Lasse Schuirmann <lasse schuirmann gmail com>
Date:   Sun Jul 20 15:59:48 2014 +0200

    media-manager: Use original media if unattended setup fails
    
    If the UnattendedInstaller instance cannot be created, fallback to the
    original installation media.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=730640

 src/media-manager.vala |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/media-manager.vala b/src/media-manager.vala
index 2fade9c..f52857a 100644
--- a/src/media-manager.vala
+++ b/src/media-manager.vala
@@ -167,11 +167,14 @@ private class Boxes.MediaManager : Object {
         filter.add_constraint (INSTALL_SCRIPT_PROP_PROFILE, INSTALL_SCRIPT_PROFILE_DESKTOP);
         install_scripts = (install_scripts as Osinfo.List).new_filtered (filter) as InstallScriptList;
 
-        InstallerMedia install_media;
+        InstallerMedia install_media = media;
         if (install_scripts.get_length () > 0) {
-            install_media = new UnattendedInstaller.from_media (media, install_scripts);
-        } else
-            install_media = media;
+            try {
+                install_media = new UnattendedInstaller.from_media (media, install_scripts);
+            } catch (GLib.IOError.NOT_SUPPORTED e) {
+                debug ("Unattended installer setup failed: %s", e.message);
+            }
+        }
 
         return install_media;
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]