From c6d6a6bf299db0314a444258dcde7716c580dba2 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Tue, 3 Jun 2008 12:05:50 +0000 Subject: [PATCH 1/1] allow default services lists from /usr/share/enigma2/defaults AND /usr/share/enigma2/dealer --- lib/python/Screens/ScanSetup.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 357888f8..5d049545 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -7,7 +7,7 @@ from Components.ActionMap import NumberActionMap, ActionMap from Components.ConfigList import ConfigListScreen from Components.NimManager import nimmanager, getConfigSatlist from Components.Label import Label -from Tools.Directories import resolveFilename, SCOPE_DEFAULTPARTITIONMOUNTDIR +from Tools.Directories import resolveFilename, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITION from Screens.MessageBox import MessageBox from enigma import eTimer, eDVBFrontendParametersSatellite, eComponentScan, \ eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial, \ @@ -282,9 +282,14 @@ class CableTransponderSearchSupport: class DefaultSatLists(DefaultWizard): def __init__(self, session, silent = True, showSteps = False): DefaultWizard.__init__(self, session, silent, showSteps, neededTag = "services") + print "configuredSats:", nimmanager.getConfiguredSats() def setDirectory(self): - self.directory = resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR) + self.directory = [] + self.directory.append(resolveFilename(SCOPE_DEFAULTDIR)) + 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): -- 2.30.2