Fix distro autodetect

install/variables/distr.py

@@ -121,18 +121,21 @@ class DistroRepository(Linux):
             if not d:
                 return False
             # check filter conditions
-            if system and systemByName(d['name']) != system:
+            if system and systemByName(d['os_linux_shortname']) != system:
                 return False
-            if not "name" in d or not "ver" in d:
+            if not "os_linux_shortname" in d or not "os_linux_ver" in d:
                 return False
-            if shortname and d['name'].lower() != shortname.lower():
+            if shortname and \
+                d['os_linux_shortname'].lower() != shortname.lower():
                 return False
-            if march and d['march'] != march:
+            if march and d['os_arch_machine'] != march:
                 return False
-            if version and not verCmp(getTupleVersion(d['ver']), version):
+            if version and \
+                not verCmp(getTupleVersion(d['os_linux_ver']), version):
                 return False
-            if build and "build" in d and (not d['build'].isdigit() or 
+            if build and "os_linux_build" in d and \
-                                           not buildCmp(int(d['build']),build)):
+                (not d['os_linux_build'].isdigit() or 
+                 not buildCmp(int(d['os_linux_build']),build)):
                 return False
             return True
 
@@ -167,11 +170,11 @@ class DistroRepository(Linux):
 
     def sortdistrfunc(self,x,y):
         """Func of comparing two distributive"""
-        ver1, ver2 = x[1].get('ver',""), y[1].get('ver',"")
+        ver1, ver2 = x[1].get('os_linux_ver',""), y[1].get('os_linux_ver',"")
         if ver1 and ver2 and ver1 != "0" and ver2 != "0" and ver1 != ver2:
             return cmpVersion(ver1,ver2)
-        build1 = getTupleVersion(x[1].get('build',""))
+        build1 = getTupleVersion(x[1].get('os_linux_build',""))
-        build2 = getTupleVersion(y[1].get('build',""))
+        build2 = getTupleVersion(y[1].get('os_linux_build',""))
         if  build1 != build2:
             return cmp(build1,build2)
         else: