[oe-commits] org.oe.dev package.bbclass: add workaround for wrongly globbed symlinks in FILES causing python

[Michael 'Mickey' Lauer]

pb commit wrote:
> package.bbclass: add workaround for wrongly globbed symlinks in FILES causing python
> traceback spew during population

> Author: pb at openembedded.org
> Branch: org.openembedded.dev
> Revision: 77212e456a021803396d11bcad7616c51e5c6d25
> ViewMTN:
> http://monotone.openembedded.org/revision.psp?id=77212e456a021803396d11bcad7616c51e5c6d25
> Files:
> 1
> classes/package.bbclass
> Diffs:

> #
> # mt diff -r4babe1caf820e719d27c7ed13d9518351ba729f3
> -r77212e456a021803396d11bcad7616c51e5c6d25
> #
> # 
> # 
> # patch "classes/package.bbclass"
> #  from [edf00c41e2683d3180be274fedde142ed3837c83]
> #    to [4c30e72ec3dcec6b3bddaaa4e5dc3cb458993749]
> # 
> ============================================================
> --- classes/package.bbclass    
> edf00c41e2683d3180be274fedde142ed3837c83
> +++ classes/package.bbclass    
> 4c30e72ec3dcec6b3bddaaa4e5dc3cb458993749
> @@ -408,11 +408,16 @@ python populate_packages () {
>                         fpath = os.path.join(root,file)
>                         dpath = os.path.dirname(fpath)
>                         bb.mkdirhier(dpath)
> +                       if file in cleandirs:
> +                               cleandirs.remove(file)
>                         ret = bb.movefile(file,fpath)
>                         if ret is None or ret == 0:
>                                 raise bb.build.FuncFailed("File population failed")
>                 for dir in cleandirs:
> -                       os.rmdir(dir)
> +                       if os.path.isdir(dir):
> +                               os.rmdir(dir)
> +                       else:
> +                               bb.note("ERROR: directory %s went
> away unexpectedly during package population" % dir)
>                 del localdata
>         os.chdir(workdir)
>  

This seems break with base-files:

NOTE: package base-files-3.0.14-r58: task do_package: started
ERROR: Error in executing: /home/stefan/Projekte/OpenEZX/oe/org.openembedded.dev/packages/base-files/base-files_3.0.14.bb
ERROR: Exception:exceptions.OSError Message:[Errno 22] Invalid argument: './'
ERROR: Printing the environment of the function
ERROR:  0113:                   if ret is None or ret == 0:
ERROR:  0114:                           raise bb.build.FuncFailed("File population failed")
ERROR:  0115:           for dir in cleandirs:
ERROR:  0116:                   if os.path.isdir(dir):
ERROR:  0117:                           os.rmdir(dir)
ERROR:  0118:                   else:
ERROR:  0119:                           bb.note("ERROR: directory %s went away unexpectedly during package population" % dir)
ERROR:  0120:           del localdata
ERROR:  0121:   os.chdir(workdir)
ERROR: Error in executing: /home/stefan/Projekte/OpenEZX/oe/org.openembedded.dev/packages/base-files/base-files_3.0.14.bb
ERROR: Exception:exceptions.OSError Message:[Errno 22] Invalid argument: './'


Regards,

:M:
-- 
Michael 'Mickey' Lauer | IT-Freelancer | http://www.vanille-media.de