use builtin python functions instead of use os.system

[enigma2.git] / lib / python / Screens / ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 5d0495450314a140153e252629798474f1b91b4c..b14c7e7482b219e84431274d662415b512b90be5 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -281,6 +281,7 @@ class CableTransponderSearchSupport:
 
 class DefaultSatLists(DefaultWizard):
        def __init__(self, session, silent = True, showSteps = False):
+               self.xmlfile = "defaultsatlists.xml"
                DefaultWizard.__init__(self, session, silent, showSteps, neededTag = "services")
                print "configuredSats:", nimmanager.getConfiguredSats()
 
@@ -290,13 +291,12 @@ class DefaultSatLists(DefaultWizard):
                import os
                os.system("mount %s %s" % (resolveFilename(SCOPE_DEFAULTPARTITION), resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)))
                self.directory.append(resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR))
-               self.xmlfile = "defaultsatlists.xml"
-               
+                               
        def statusCallback(self, status, progress):
                print "statusCallback:", status, progress
                from Components.DreamInfoHandler import DreamInfoHandler
                if status == DreamInfoHandler.STATUS_DONE:
-                       self["text"].setText(_("The installation of the default services lists is finished."))
+                       self["text"].setText(_("The installation of the default services lists is finished.") + "\n\n" + _("Please press OK to continue."))
                        self.markDone()
                        self.disableKeys = False        
 
@@ -797,18 +797,6 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
        def getNetworksForNim(self, nim):
                if nim.isCompatible("DVB-S"):
                        networks = nimmanager.getSatListForNim(nim.slot)
-# the original code took "loopthrough" etc. into account. Do we need this?
-#                      if nimmanager.getNimConfigMode(1) in ["loopthrough", "satposdepends", "equal", "nothing"]:
-#                              return False
-#                      sec = eDVBSatelliteEquipmentControl.getInstance()
-#                      if sec is not None:
-#                              exclusive_satellites = sec.get_exclusive_satellites(0,1)
-#                              if len(exclusive_satellites) == 2:
-#                                      return False
-#                              idx = exclusive_satellites[0]+1
-#                              exclusive_nim_sats = exclusive_satellites[idx+1:idx+1+exclusive_satellites[idx]]
-#                              if len(exclusive_nim_sats):
-#                                      return True
                elif not nim.empty:
                        networks = [ nim.type ] # "DVB-C" or "DVB-T". TODO: seperate networks for different C/T tuners, if we want to support that.
                else: