[oe-commits] [openembedded-core] branch master updated: package_ipk: Minor import tweak + ensure packages regenerated

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

The following commit(s) were added to refs/heads/master by this push:
     new ef24a54  package_ipk: Minor import tweak + ensure packages regenerated
ef24a54 is described below

commit ef24a545d11febb96d1c0f02c60d9701295ef592
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Feb 13 14:06:49 2020 +0000

    package_ipk: Minor import tweak + ensure packages regenerated
    
    The recent opkg-utils change didn't update all the packages since its
    marked as ABISAFE (and has to be due to update-alternatives).
    
    Fix a minor import issue to avoid multiple imports of glob which
    also causes packages to re-generate.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package_ipk.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 4f23977..25d1ab7 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -45,6 +45,7 @@ def ipk_write_pkg(pkg, d):
     import subprocess
     import textwrap
     import collections
+    import glob
 
     def cleanupcontrol(root):
         for p in ['CONTROL', 'DEBIAN']:
@@ -101,8 +102,7 @@ def ipk_write_pkg(pkg, d):
         bb.utils.mkdirhier(pkgoutdir)
         os.chdir(root)
         cleanupcontrol(root)
-        from glob import glob
-        g = glob('*')
+        g = glob.glob('*')
         if not g and localdata.getVar('ALLOW_EMPTY', False) != "1":
             bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV'), localdata.getVar('PKGR')))
             return

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.