aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2008-06-03 12:05:50 +0000
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2008-06-03 12:05:50 +0000
commitc6d6a6bf299db0314a444258dcde7716c580dba2 (patch)
tree8d65bfea131f65556eea29f81e4f1c5a771db6e6 /lib/python
parentfa9ec93b201ff3312817e7562b100bdf1d23270a (diff)
downloadenigma2-c6d6a6bf299db0314a444258dcde7716c580dba2.tar.gz
enigma2-c6d6a6bf299db0314a444258dcde7716c580dba2.zip
allow default services lists from /usr/share/enigma2/defaults AND
/usr/share/enigma2/dealer
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/ScanSetup.py9
1 files 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):