diff options
| author | Felix Domke <felix.domke@multimedia-labs.de> | 2009-07-16 23:41:52 +0200 |
|---|---|---|
| committer | Felix Domke <felix.domke@multimedia-labs.de> | 2009-07-16 23:41:52 +0200 |
| commit | 37bac1d63115720ca83f064e0e4f5426271fc364 (patch) | |
| tree | bb3c2f65db1ac96f86328035c7bd4f7bcb2aa1ed /lib/python | |
| parent | ff69eecfab66bbfa534d8a766c001c79a13ac90e (diff) | |
| parent | f834b32700be1cde60218fea84756fdc91fddacd (diff) | |
| download | enigma2-37bac1d63115720ca83f064e0e4f5426271fc364.tar.gz enigma2-37bac1d63115720ca83f064e0e4f5426271fc364.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python')
| -rwxr-xr-x | lib/python/Components/Harddisk.py | 6 | ||||
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index 637c8898..2efdb68f 100755 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -6,11 +6,7 @@ import time from Components.Console import Console def readFile(filename): - try: - file = open(filename) - except IOError: - return "" - + file = open(filename) data = file.read().strip() file.close() return data diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py index 6d404cf2..6292a46f 100644 --- a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py +++ b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py @@ -494,7 +494,7 @@ class NFIDownload(Screen): self.taskstring = "" self.container.appClosed.append(self.fdisk_finished) self.container.execute("fdisk " + self.stickdevice + "/disc") - self.container.write("d\nn\np\n1\n\n\nt\n6\nw\n") + self.container.write("d\n4\nd\n3\nd\n2\nd\nn\np\n1\n\n\nt\n6\nw\n") self.delayTimer = eTimer() self.delayTimer.callback.append(self.progress_increment) self.delayTimer.start(105, False) |