File virtinst-fix-sle12sp1-detection.patch of Package virt-manager.2133

Overview Repositories Revisions Requests Users Attributes Meta

File virtinst-fix-sle12sp1-detection.patch of Package virt-manager.2133

Index: virt-manager-1.2.1/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
+++ virt-manager-1.2.1/virtinst/urlfetcher.py
@@ -346,6 +346,10 @@ def _distroFromSUSEContent(fetcher, arch
             distro_distro = line.rsplit(',', 1)
         elif line.startswith("VERSION "):
             distro_version = line.split(' ', 1)
+            if len(distro_version) > 1:
+                d_version = distro_version[1].split('-', 1)
+                if len(d_version) > 1:
+                    distro_version[1] = d_version[0]
         elif line.startswith("SUMMARY "):
             distro_summary = line.split(' ', 1)
         elif line.startswith("BASEARCHS "):
@@ -379,17 +383,23 @@ def _distroFromSUSEContent(fetcher, arch
         elif cbuf.find("ppc64le") != -1:
             arch = "ppc64le"
 
+    def parse_sle_distribution(d):
+        sle_version = d[1].strip().rsplit(' ')[4]
+        if len(d[1].strip().rsplit(' ')) > 5:
+            sle_version = sle_version + '.' + d[1].strip().rsplit(' ')[5][2]
+        return ['VERSION', sle_version]
+
     dclass = GenericDistro
     if distribution:
         if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \
             re.match(".*SUSE SLES*", distribution[1]):
             dclass = SLESDistro
             if distro_version is None:
-                distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
+                distro_version = parse_sle_distribution(distribution)
         elif re.match(".*SUSE Linux Enterprise Desktop*", distribution[1]):
             dclass = SLEDDistro
             if distro_version is None:
-                distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
+                distro_version = parse_sle_distribution(distribution)
         elif re.match(".*Open Enterprise Server*", distribution[1]):
             dclass = SLESDistro
             if distro_version is None:

Places

File virtinst-fix-sle12sp1-detection.patch of Package virt-manager.2133

Places