git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
properly handle tags combined with other prerequisites
[enigma2.git]
/
lib
/
python
/
Components
/
DreamInfoHandler.py
diff --git
a/lib/python/Components/DreamInfoHandler.py
b/lib/python/Components/DreamInfoHandler.py
index 8e9a8a27a3a0476af68991a7f16115327e85d9b8..9753e42b2efb2f3dad5eb9a0d2209cedcba6ee3e 100644
(file)
--- a/
lib/python/Components/DreamInfoHandler.py
+++ b/
lib/python/Components/DreamInfoHandler.py
@@
-149,9
+149,13
@@
class DreamInfoHandler:
return False
else:
if prerequisites.has_key("tag"):
return False
else:
if prerequisites.has_key("tag"):
- if self.neededTag in prerequisites["tag"]:
- return True
- return False
+ if not self.neededTag in prerequisites["tag"]:
+ return False
+
+ if prerequisites.has_key("satellite"):
+ for sat in prerequisites["satellite"]:
+ if int(sat) not in nimmanager.getConfiguredSats():
+ return False
if prerequisites.has_key("bcastsystem"):
for bcastsystem in prerequisites["bcastsystem"]:
if nimmanager.hasNimType(bcastsystem):
if prerequisites.has_key("bcastsystem"):
for bcastsystem in prerequisites["bcastsystem"]:
if nimmanager.hasNimType(bcastsystem):
@@
-193,10
+197,13
@@
class DreamInfoHandler:
#print "attributes:", attributes
if self.currentAttributeIndex >= len(self.attributeNames): # end of package reached
#print "attributes:", attributes
if self.currentAttributeIndex >= len(self.attributeNames): # end of package reached
+ print "end of package reached"
if self.currentlyInstallingMetaIndex is None or self.currentlyInstallingMetaIndex >= len(self.installIndexes) - 1:
if self.currentlyInstallingMetaIndex is None or self.currentlyInstallingMetaIndex >= len(self.installIndexes) - 1:
+ print "set status to DONE"
self.setStatus(self.STATUS_DONE)
return
else:
self.setStatus(self.STATUS_DONE)
return
else:
+ print "increment meta index to install next package"
self.currentlyInstallingMetaIndex += 1
self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])
self.currentlyInstallingMetaIndex += 1
self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])