Merge branch 'master' of git.opendreambox.org:/git/enigma2

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 4732532734af0632c838d33c65c46025d47528e2..1dff777af3189fa1f4f404cfa1ecbbecbdda2702 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -565,9 +565,10 @@ class NimManager:
                if self.hasNimType("DVB-S"):
                        print "Reading satellites.xml"
                        db.readSatellites(self.satList, self.satellites, self.transponders)
-#                      print "SATLIST", self.satList
-#                      print "SATS", self.satellites
-#                      print "TRANSPONDERS", self.transponders
+                       self.satList.sort(key = lambda x: x[0]) # sort by orbpos
+                       #print "SATLIST", self.satList
+                       #print "SATS", self.satellites
+                       #print "TRANSPONDERS", self.transponders
 
                if self.hasNimType("DVB-C"):
                        print "Reading cables.xml"

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 9ef6dd94103df79f1e0434797b64972c9f39276d..d15c232ba1c259cbcac07c97289117bd4bfbfe1c 100755 (executable)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1184,7 +1184,6 @@ class ConfigSatlist(ConfigSelection):
        def __init__(self, list, default = None):
                if default is not None:
                        default = str(default)
-               list.sort(key = lambda x: int(x[0]))
                self._satList = list
                choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list]