Remove 'Open Enterprise Server' stuff from this patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=263
This commit is contained in:
Charles Arnold 2015-09-11 15:14:03 +00:00 committed by Git OBS Bridge
parent 21fff4248e
commit 4b3b6954cb

View File

@ -17,18 +17,7 @@ Index: virt-manager-1.2.1/virtinst/urlfetcher.py
dclass = GenericDistro
if distribution:
@@ -387,6 +393,10 @@ def _distroFromSUSEContent(fetcher, arch
dclass = SLESDistro
if distro_version is None:
distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
+ elif re.match(".*Open Enterprise Server*", distribution[1]):
+ dclass = SLESDistro
+ if distro_version is None:
+ distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
elif re.match(".*openSUSE.*", distribution[1]):
dclass = OpensuseDistro
if distro_version is None:
@@ -940,16 +950,23 @@ class SuseDistro(Distro):
@@ -940,16 +946,23 @@ class SuseDistro(Distro):
oldkern += "64"
oldinit += "64"
@ -62,7 +51,7 @@ Index: virt-manager-1.2.1/virtinst/urlfetcher.py
def _variantFromVersion(self):
distro_version = self.version_from_content[1].strip()
@@ -977,6 +994,13 @@ class SuseDistro(Distro):
@@ -977,6 +990,13 @@ class SuseDistro(Distro):
self._variantFromVersion()
self.os_variant = self._detect_osdict_from_url()