aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorFraxinas <andreas.frisch@multimedia-labs.de>2010-08-12 12:05:33 +0200
committerghost <andreas.monzner@multimedia-labs.de>2010-10-06 23:06:47 +0200
commitc437ed274b0155ecdeb7382d6ee46d67a53755b9 (patch)
tree2773329a8dd37150ffc12e983133c6fd77b03c0a /lib/python
parent8c0d8d821ec868cfa246923fc3e438b8f71877a0 (diff)
downloadenigma2-c437ed274b0155ecdeb7382d6ee46d67a53755b9.tar.gz
enigma2-c437ed274b0155ecdeb7382d6ee46d67a53755b9.zip
NFIFlash: hide hdd and other mounts (#480)
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
index c0094cc1..79fa069a 100644
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
@@ -515,13 +515,7 @@ class NFIDownload(Screen):
self.target_dir = usbpartition[0][1]
self.ackDestinationDevice(device_description=usbpartition[0][0])
else:
- self.openDeviceBrowser()
-
- def openDeviceBrowser(self):
- if self.branch != STICK_WIZARD:
self.session.openWithCallback(self.DeviceBrowserClosed, DeviceBrowser, None, showDirectories=True, showMountpoints=True, inhibitMounts=["/autofs/sr0/"])
- if self.branch == STICK_WIZARD:
- self.session.openWithCallback(self.DeviceBrowserClosed, DeviceBrowser, None, showDirectories=False, showMountpoints=True, inhibitMounts=["/","/autofs/sr0/"])
def DeviceBrowserClosed(self, path):
print "[DeviceBrowserClosed]", str(path)
@@ -537,7 +531,7 @@ class NFIDownload(Screen):
else:
dev = device_description
message = _("Do you want to download the image to %s ?") % (dev)
- choices = [(_("Yes"), self.ackedDestination), (_("List of Storage Devices"),self.openDeviceBrowser), (_("Cancel"),self.keyRed)]
+ choices = [(_("Yes"), self.ackedDestination), (_("List of Storage Devices"),self.askDestination), (_("Cancel"),self.keyRed)]
self.session.openWithCallback(self.ackDestination_query, ChoiceBox, title=message, list=choices)
def ackDestination_query(self, choice):
@@ -637,7 +631,7 @@ class NFIDownload(Screen):
First, you need to prepare a USB stick so that it is bootable.
In the next step, an NFI image file can be downloaded from the update server and saved on the USB stick.
If you already have a prepared bootable USB stick, please insert it now. Otherwise plug in a USB stick with a minimum size of 64 MB!""")
- self.session.openWithCallback(self.wizardDeviceBrowserClosed, DeviceBrowser, None, message, showDirectories=True, showMountpoints=True, inhibitMounts=["/","/autofs/sr0/"])
+ self.session.openWithCallback(self.wizardDeviceBrowserClosed, DeviceBrowser, None, message, showDirectories=True, showMountpoints=True, inhibitMounts=["/","/autofs/sr0/","/autofs/sda1/","/media/hdd/","/media/net/","/media/usb/","/media/dvd/"])
def wizardDeviceBrowserClosed(self, path):
print "[wizardDeviceBrowserClosed]", path
@@ -678,7 +672,7 @@ If you already have a prepared bootable USB stick, please insert it now. Otherwi
self.menulist.append((ALLIMAGES, _("Choose image to download"), _("Select desired image from feed list" ), None))
self.menulist.append((STICK_WIZARD, _("USB stick wizard"), _("Prepare another USB stick for image flashing" ), None))
self["menu"].setList(self.menulist)
- self["status"].text = _("Currently installed image") + ": %s" % (about.getImageVersionString()))
+ self["status"].text = _("Currently installed image") + ": %s" % (about.getImageVersionString())
self.branch = START
self.updateButtons()