FYI, On Mon, Nov 14, 2016 at 10:08:23PM -0000, [email protected] wrote: > ------------------------------------------------------------ > revno: 3582 > committer: Steve Beattie <[email protected]> > branch nick: apparmor > timestamp: Mon 2016-11-14 14:06:41 -0800 > message: > libapparmor python bindings: use __init__.py to import from LibAppArmor.py > > Fix import errors with swig > 3.0.8 with the libapparmor python > bindings. Do this by removing the code to rename the generated > LibAppArmor.py, and instead use a stub __init__.py that automatically > imports everything from LibAppArmor.py. Also adjust bzrignore to > compensate for the autogenerated file name changing. > > Bug: https://bugzilla.opensuse.org/show_bug.cgi?id=987607 > > Signed-off-by: Steve Beattie <[email protected]> > Acked-by: Christian Boltz <[email protected]> > added: > libraries/libapparmor/swig/python/__init__.py > modified: > .bzrignore > libraries/libapparmor/swig/python/Makefile.am
Because this commit (and the corresponding 2.10 commit) adds a file that previously may have existed as the result of being autogenerated in a build, when doing a bzr up/bzr pull, you may end up with a conflict out of this. It's safe to just remove the copy that bzr makes of the generated file and mark it resolved via 'bzr resolved libraries/libapparmor/swig/python/__init__.py'. Sorry for the minor hiccup. Thanks. -- Steve Beattie <[email protected]> http://NxNW.org/~steve/
signature.asc
Description: PGP signature
-- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
