Merge branch 'vuplus-1.6' of 192.168.102.66:/opt/repository/openembedded into vuplus-1.6

[vuplus_openembedded] / classes / update-alternatives.bbclass

diff --git a/classes/update-alternatives.bbclass b/classes/update-alternatives.bbclass
index 6b2b547..ddbf4c1 100644 (file)
--- a/classes/update-alternatives.bbclass
+++ b/classes/update-alternatives.bbclass
@@ -10,11 +10,14 @@ update_alternatives_postrm() {
 update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH}
 }
 
+def update_alternatives_after_parse(d):
+    if bb.data.getVar('ALTERNATIVE_NAME', d) == None:
+        raise bb.build.FuncFailed, "%s inherits update-alternatives but doesn't set ALTERNATIVE_NAME" % bb.data.getVar('FILE', d)
+    if bb.data.getVar('ALTERNATIVE_PATH', d) == None:
+        raise bb.build.FuncFailed, "%s inherits update-alternatives but doesn't set ALTERNATIVE_PATH" % bb.data.getVar('FILE', d)
+
 python __anonymous() {
-       if bb.data.getVar('ALTERNATIVE_NAME', d) == None:
-               raise bb.build.FuncFailed, "%s inherits update-alternatives but doesn't set ALTERNATIVE_NAME" % bb.data.getVar('FILE', d)
-       if bb.data.getVar('ALTERNATIVE_PATH', d) == None:
-               raise bb.build.FuncFailed, "%s inherits update-alternatives but doesn't set ALTERNATIVE_PATH" % bb.data.getVar('FILE', d)
+    update_alternatives_after_parse(d)
 }
 
 python populate_packages_prepend () {