git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/python/Plugins/SystemPlugins/SoftwareManager: more robust code this i.e. fixes:
[enigma2.git]
/
lib
/
python
/
Plugins
/
SystemPlugins
/
SoftwareManager
/
SoftwareTools.py
diff --git
a/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
b/lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
index 4e7591ef9fd9fabbd9086f865d0c2ee8c2549fd1..e8cf6dc2cf82d5b080e9c153e62e255009b42f1b 100755
(executable)
--- a/
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
+++ b/
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
@@
-94,14
+94,17
@@
class SoftwareTools(DreamInfoHandler):
def IpkgListAvailableCB(self, result, retval, extra_args = None):
(callback) = extra_args
def IpkgListAvailableCB(self, result, retval, extra_args = None):
(callback) = extra_args
- if
len(result)
:
+ if
result
:
if SoftwareTools.list_updating:
SoftwareTools.available_packetlist = []
for x in result.splitlines():
if SoftwareTools.list_updating:
SoftwareTools.available_packetlist = []
for x in result.splitlines():
-
split
= x.split(' - ')
- name =
split
[0].strip()
+
tokens
= x.split(' - ')
+ name =
tokens
[0].strip()
if not any(name.endswith(x) for x in self.unwanted_extensions):
if not any(name.endswith(x) for x in self.unwanted_extensions):
- SoftwareTools.available_packetlist.append([name, split[1].strip(), split[2].strip()])
+ l = len(tokens)
+ version = l > 1 and tokens[1].strip() or ""
+ descr = l > 2 and tokens[2].strip() or ""
+ SoftwareTools.available_packetlist.append([name, version, descr])
if callback is None:
self.startInstallMetaPackage()
else:
if callback is None:
self.startInstallMetaPackage()
else:
@@
-126,7
+129,7
@@
class SoftwareTools(DreamInfoHandler):
def InstallMetaPackageCB(self, result, retval, extra_args = None):
(callback) = extra_args
def InstallMetaPackageCB(self, result, retval, extra_args = None):
(callback) = extra_args
- if
len(result)
:
+ if
result
:
self.fillPackagesIndexList()
if callback is None:
self.startIpkgListInstalled()
self.fillPackagesIndexList()
if callback is None:
self.startIpkgListInstalled()
@@
-152,13
+155,15
@@
class SoftwareTools(DreamInfoHandler):
def IpkgListInstalledCB(self, result, retval, extra_args = None):
(callback) = extra_args
def IpkgListInstalledCB(self, result, retval, extra_args = None):
(callback) = extra_args
- if
len(result)
:
+ if
result
:
SoftwareTools.installed_packetlist = {}
for x in result.splitlines():
SoftwareTools.installed_packetlist = {}
for x in result.splitlines():
-
split
= x.split(' - ')
- name =
split
[0].strip()
+
tokens
= x.split(' - ')
+ name =
tokens
[0].strip()
if not any(name.endswith(x) for x in self.unwanted_extensions):
if not any(name.endswith(x) for x in self.unwanted_extensions):
- SoftwareTools.installed_packetlist[name] = split[1].strip()
+ l = len(tokens)
+ version = l > 1 and tokens[1].strip() or ""
+ SoftwareTools.installed_packetlist[name] = version
if callback is None:
self.countUpdates()
else:
if callback is None:
self.countUpdates()
else:
@@
-203,7
+208,7
@@
class SoftwareTools(DreamInfoHandler):
def IpkgUpdateCB(self, result, retval, extra_args = None):
(callback) = extra_args
def IpkgUpdateCB(self, result, retval, extra_args = None):
(callback) = extra_args
- if
len(result)
:
+ if
result
:
if self.Console:
if len(self.Console.appContainers) == 0:
if callback is not None:
if self.Console:
if len(self.Console.appContainers) == 0:
if callback is not None: