From db6d001b0e2fcaf55a40777fd320184a499d73f0 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 17 Feb 2014 16:40:03 +0100 Subject: [PATCH] tests: fix to not fail with libosinfo Signed-off-by: Giuseppe Scrivano --- tests/misc.py | 3 +-- virtinst/osdict.py | 2 +- virtinst/urlfetcher.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/misc.py b/tests/misc.py index 1c08afb7e..76875a5dc 100644 --- a/tests/misc.py +++ b/tests/misc.py @@ -22,8 +22,7 @@ import os import sys import unittest -_badmodules = ["gi.repository.Gtk", "gi.repository.GObject", - "gi.repository.Gdk", "gi.repository.GLib"] +_badmodules = ["gi.repository.Gtk", "gi.repository.Gdk"] def _restore_modules(fn): diff --git a/virtinst/osdict.py b/virtinst/osdict.py index 3c22b6abf..698005db0 100644 --- a/virtinst/osdict.py +++ b/virtinst/osdict.py @@ -22,7 +22,7 @@ _SENTINEL = -1234 _allvariants = {} from datetime import datetime -from gi.repository import Libosinfo as libosinfo +from gi.repository import Libosinfo as libosinfo # pylint: disable=E0611 _aliases = { diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py index 0d9a0660d..7075929b4 100644 --- a/virtinst/urlfetcher.py +++ b/virtinst/urlfetcher.py @@ -658,7 +658,7 @@ class FedoraDistro(RedHatDistro): """ ret = None for osinfo in osdict.list_os(typename="linux"): - if osinfo.name.startswith("fedora"): + if osinfo.name.startswith("fedora") and "unknown" not in osinfo.name: # First fedora* occurence should be the newest ret = osinfo.name break