[oe-commits] org.oe.dev insane.bbclass: Raise exceptions, not strings (from poky)

rpurdie commit openembedded-commits at lists.openembedded.org
Sat Sep 29 11:03:57 UTC 2007


insane.bbclass: Raise exceptions, not strings (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 64ce6ddfa4b5769b0985d7ad324495e5ff0714ab
ViewMTN: http://monotone.openembedded.org/revision/info/64ce6ddfa4b5769b0985d7ad324495e5ff0714ab
Files:
1
classes/insane.bbclass
Diffs:

#
# mt diff -r69e0da18de2ae5a5f9c5a0b88532c9fc8dbe4780 -r64ce6ddfa4b5769b0985d7ad324495e5ff0714ab
#
# 
# 
# patch "classes/insane.bbclass"
#  from [b551af84399a32d80cacf9e2dcb59c334037034a]
#    to [49f1740d9ecf1927b4c66368e1d312c78bac9f7d]
# 
============================================================
--- classes/insane.bbclass	b551af84399a32d80cacf9e2dcb59c334037034a
+++ classes/insane.bbclass	49f1740d9ecf1927b4c66368e1d312c78bac9f7d
@@ -101,7 +101,7 @@ def package_qa_get_elf(path, bits32):
         def my_assert(expectation, result):
             if not expectation == result:
                 #print "'%x','%x'" % (ord(expectation), ord(result))
-                raise "This does not work as expected"
+                raise Exception("This does not work as expected")
         my_assert = staticmethod(my_assert)
 
         def __init__(self, name):
@@ -124,13 +124,13 @@ def package_qa_get_elf(path, bits32):
 
             self.sex = self.data[ELFFile.EI_DATA]
             if self.sex == chr(ELFFile.ELFDATANONE):
-                raise "Can't be"
+                raise Exception("self.sex == ELFDATANONE")
             elif self.sex == chr(ELFFile.ELFDATA2LSB):
                 self.sex = "<"
             elif self.sex == chr(ELFFile.ELFDATA2MSB):
                 self.sex = ">"
             else:
-                raise "Even more worse"
+                raise Exception("Unknown self.sex")
 
         def osAbi(self):
             return ord(self.data[ELFFile.EI_OSABI])
@@ -376,7 +376,7 @@ def package_qa_check_rdepends(pkg, workd
 
         bb.data.setVar('ROOT', '', localdata) 
         bb.data.setVar('ROOT_%s' % pkg, root, localdata)
-        pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1)
+        pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, True)
         if not pkgname:
             pkgname = pkg
         bb.data.setVar('PKG', pkgname, localdata)






More information about the Openembedded-commits mailing list