[gnome-boxes/final-backports-for-3.37.91: 2/5] assistant, media-manager: Remove special casing of GNOME OS

[Felipe Borges <felipeborges src gnome org>]

commit f3e6bc1476c462c9b465ab3bd57e88f26af4f9a1
Author: Felipe Borges <felipeborges gnome org>
Date:   Thu Aug 27 12:28:48 2020 +0200

    assistant, media-manager: Remove special casing of GNOME OS
    
    Now with the "Identify OS" page in the VM creation assistant, this
    is not necessary.

 src/assistant/preparation-page.vala |  6 +-----
 src/installed-media.vala            | 17 -----------------
 src/media-manager.vala              |  9 ---------
 3 files changed, 1 insertion(+), 31 deletions(-)
---
diff --git a/src/assistant/preparation-page.vala b/src/assistant/preparation-page.vala
index 7d05f646..d070eb76 100644
--- a/src/assistant/preparation-page.vala
+++ b/src/assistant/preparation-page.vala
@@ -34,11 +34,7 @@
     public async void setup (InstallerMedia media, Osinfo.Os? os = null) {
         try {
             var media_manager = MediaManager.get_instance ();
-            if (os != null && os.id.has_prefix ("http://gnome.org";)) {
-                this.media = yield media_manager.create_installer_media_for_gnome_os (media, os);
-            } else {
-                this.media = media_manager.create_installer_media_from_media (media, os);
-            }
+            this.media = media_manager.create_installer_media_from_media (media, os);
         } catch (GLib.Error error) {
             warning ("Failed to setup installation media '%s': %s", media.device_file, error.message);
         }
diff --git a/src/installed-media.vala b/src/installed-media.vala
index c10ed36c..3a730af3 100644
--- a/src/installed-media.vala
+++ b/src/installed-media.vala
@@ -68,23 +68,6 @@ public InstalledMedia (string path, bool known_qcow2 = false) throws GLib.Error
         label_setup ();
     }
 
-    public async InstalledMedia.gnome_nightly (string path) throws GLib.Error {
-        this (path, true);
-        is_gnome = true;
-
-        try {
-            var media_manager = MediaManager.get_instance ();
-            os = yield media_manager.os_db.get_os_by_id ("http://gnome.org/gnome/nightly";);
-            os_media = os.get_media_list ().get_nth (0) as Osinfo.Media;
-        } catch (OSDatabaseError.UNKNOWN_OS_ID error) {
-            debug (error.message);
-        }
-
-        resources = OSDatabase.get_default_resources ();
-
-        label_setup ();
-    }
-
     // Also converts to native format (QCOW2)
     public async void copy (string destination_path) throws GLib.Error {
         var decompressed = yield decompress ();
diff --git a/src/media-manager.vala b/src/media-manager.vala
index 48484452..79b198c3 100644
--- a/src/media-manager.vala
+++ b/src/media-manager.vala
@@ -219,15 +219,6 @@ public InstallerMedia create_installer_media_from_media (InstallerMedia media, O
         return create_unattended_installer (media);
     }
 
-    public async InstallerMedia create_installer_media_for_gnome_os (InstallerMedia media, Os? os = null) 
throws GLib.Error {
-        try {
-            return yield new InstalledMedia.gnome_nightly (media.device_file);
-        } catch (GLib.Error error) {
-            warning ("Failed to create GNOME Nightly config for '%s': %s", media.device_file, error.message);
-            return create_installer_media_from_media (media, os);
-        }
-    }
-
     private MediaManager () {
 #if !FLATPAK
         client = new GUdev.Client ({"block"});