classes: Sync various tweaks from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2643 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 3 insertions, 3 deletions

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 1175d1e751..9e654aac5e 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -152,7 +152,7 @@ python do_package_ipk () {
                 localdata = bb.data.createCopy(d)
                 root = "%s/install/%s" % (workdir, pkg)
 
-                lf = lockfile(root + ".lock")
+                lf = lockfile(root + ".lock")
 
                 bb.data.setVar('ROOT', '', localdata)
                 bb.data.setVar('ROOT_%s' % pkg, root, localdata)
@@ -179,11 +179,12 @@ python do_package_ipk () {
                         del g[g.index('./CONTROL')]
                 except ValueError:
                         pass
-                if not g and not bb.data.getVar('ALLOW_EMPTY', localdata):
+                if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
                         from bb import note
                         note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
                         unlockfile(lf)
                         continue
+
                 controldir = os.path.join(root, 'CONTROL')
                 bb.mkdirhier(controldir)
                 try:
@@ -289,7 +290,6 @@ python do_package_ipk () {
                         os.rmdir(controldir)
                 except OSError:
                         pass
-                del localdata
                 unlockfile(lf)
 }