[oe-commits] org.oe.dreambox enigma2-plugins: cleanup and fix CONTROL parsing

[tmbinc commit]

enigma2-plugins: cleanup and fix CONTROL parsing

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: de7bad1a847f36b2b5df29b2226ce758a57aee80
ViewMTN: http://monotone.openembedded.org/revision/info/de7bad1a847f36b2b5df29b2226ce758a57aee80
Files:
1
packages/enigma2/enigma2-plugins.bb
Diffs:

#
# mt diff -r6e0ba7d36754a5fc10e178a8022fabc4feb830b8 -rde7bad1a847f36b2b5df29b2226ce758a57aee80
#
# 
# 
# patch "packages/enigma2/enigma2-plugins.bb"
#  from [117b5ee4f7f80cc84a71799a8d4db58621c9f333]
#    to [18a408c576ac5d4be5c556e53f38a0431eab60ff]
# 
============================================================
--- packages/enigma2/enigma2-plugins.bb	117b5ee4f7f80cc84a71799a8d4db58621c9f333
+++ packages/enigma2/enigma2-plugins.bb	18a408c576ac5d4be5c556e53f38a0431eab60ff
@@ -18,7 +18,10 @@ python populate_packages_prepend () {
 
 	def getControlLines(mydir, d, package):
 		import os
-		src = open(mydir + package + "/CONTROL/control").read()
+		try:
+			src = open(mydir + package + "/CONTROL/control").read()
+		except IOError:
+			return
 		for line in src.split("\n"):
 			if line.startswith('Package: '):
 				full_package = line[9:]
@@ -27,16 +30,7 @@ python populate_packages_prepend () {
 			if line.startswith('Description: '):
 				bb.data.setVar('DESCRIPTION_' + full_package, line[13:], d)
 
-	def getPackageNames(mydir,d):
-		import os
-		packages =[]
-		ignore = ['CVS','autom4te.cache','m4', 'patches']
-		for packetname in os.listdir(mydir):
-			if os.path.isdir(mydir + packetname) and packetname not in ignore:
-				packages.append(packetname)
-		return packages
-	
-	mydir = bb.data.getVar('D', d, 1).replace("image","enigma2-plugins/")
-	for package in getPackageNames(mydir, d):
-		getControlLines(mydir, d, package)	
+	mydir = bb.data.getVar('D', d, 1) + "/../enigma2-plugins/"
+	for package in bb.data.getVar('PACKAGES', d, 1).split():
+		getControlLines(mydir, d, package.split('-')[-1])
 }