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' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
python
/
Plugins
/
Extensions
/
DVDBurn
/
DVDToolbox.py
diff --git
a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
index 162bf3523e1fc76afa75ce81123bd8973d6d5bfb..ce16259ea568c5583a48446ff085714d19f2bc93 100644
(file)
--- a/
lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
+++ b/
lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
@@
-63,7
+63,7
@@
class DVDToolbox(Screen):
def pageDown(self):
self["details"].pageDown()
def pageDown(self):
self["details"].pageDown()
- def update(self, dev="",
media_state
=""):
+ def update(self, dev="",
action
=""):
self["space_label"].text = _("Please wait... Loading list...")
self["info"].text = ""
self["details"].setText("")
self["space_label"].text = _("Please wait... Loading list...")
self["info"].text = ""
self["details"].setText("")
@@
-89,7
+89,7
@@
class DVDToolbox(Screen):
for line in mediuminfo.splitlines():
if line.find("Mounted Media:") > -1:
mediatype = line.rsplit(',',1)[1][1:]
for line in mediuminfo.splitlines():
if line.find("Mounted Media:") > -1:
mediatype = line.rsplit(',',1)[1][1:]
- if mediatype.find("RW") > 0:
+ if mediatype.find("RW") > 0
or mediatype.find("RAM") > 0
:
self.formattable = True
else:
self.formattable = False
self.formattable = True
else:
self.formattable = False
@@
-186,7
+186,7
@@
class DVDformatTask(Task):
if line.startswith("- media is already formatted"):
self.error = self.ERROR_ALREADYFORMATTED
self.retryargs = [ "-force" ]
if line.startswith("- media is already formatted"):
self.error = self.ERROR_ALREADYFORMATTED
self.retryargs = [ "-force" ]
- if line.startswith("- media is not blank"):
+ if line.startswith("- media is not blank")
or line.startswith(" -format=full to perform full (lengthy) reformat;")
:
self.error = self.ERROR_ALREADYFORMATTED
self.retryargs = [ "-blank" ]
if line.startswith(":-( mounted media doesn't appear to be"):
self.error = self.ERROR_ALREADYFORMATTED
self.retryargs = [ "-blank" ]
if line.startswith(":-( mounted media doesn't appear to be"):