git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into obi/master
[enigma2.git]
/
lib
/
python
/
Plugins
/
SystemPlugins
/
NFIFlash
/
flasher.py
diff --git
a/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
b/lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
index ba96c07182814456b5cd36a8e0de0d3add979f78..3504d4cb06b564c14f18939eed0b3296c6a7c6fc 100755
(executable)
--- a/
lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
+++ b/
lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
@@
-14,7
+14,7
@@
from Screens.TaskView import JobView
from Tools.Directories import fileExists
from Tools.HardwareInfo import HardwareInfo
from os import system
from Tools.Directories import fileExists
from Tools.HardwareInfo import HardwareInfo
from os import system
-from enigma import eConsoleAppContainer, quitMainloop
+from enigma import eConsoleAppContainer, quitMainloop
, eEnv
from Components.About import about
class md5Postcondition(Condition):
from Components.About import about
class md5Postcondition(Condition):
@@
-51,7
+51,7
@@
class md5verify(Task):
class writeNAND(Task):
def __init__(self, job, param, box):
Task.__init__(self,job, ("Writing image file to NAND Flash"))
class writeNAND(Task):
def __init__(self, job, param, box):
Task.__init__(self,job, ("Writing image file to NAND Flash"))
- self.setTool(
"/usr/lib/enigma2/python/Plugins/SystemPlugins/NFIFlash/writenfi-mipsel-2.6.18-r1"
)
+ self.setTool(
eEnv.resolve("${libdir}/enigma2/python/Plugins/SystemPlugins/NFIFlash/writenfi-mipsel-2.6.18-r1")
)
if box == "dm7025":
self.end = 256
elif box[:5] == "dm800":
if box == "dm7025":
self.end = 256
elif box[:5] == "dm800":
@@
-226,4
+226,4
@@
class NFIFlash(Screen):
if self.job.status == self.job.FINISHED:
self["status"].text = ("rebooting...")
from os import system
if self.job.status == self.job.FINISHED:
self["status"].text = ("rebooting...")
from os import system
- system(
"/usr/lib/enigma2/python/Plugins/SystemPlugins/NFIFlash/kill_e2_reboot.sh"
)
+ system(
eEnv.resolve("${libdir}/enigma2/python/Plugins/SystemPlugins/NFIFlash/kill_e2_reboot.sh")
)