[oe-commits] Ross Burton : package_deb: check CONFFILES exist before adding them to metadata

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 767a3d1c45f97add720174a7034df750bfb09a8e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=767a3d1c45f97add720174a7034df750bfb09a8e

Author: Ross Burton <ross.burton at intel.com>
Date:   Fri Feb 15 13:03:51 2013 +0000

package_deb: check CONFFILES exist before adding them to metadata

dpkg-deb verifies that conffiles exist, so verify that the specified files
actually exist before writing them to conffiles.

This mirrors the behaviour of FILES and package_rpm's CONFFILES handling.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/package_deb.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 12e01d1..eea15e7 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -365,7 +365,8 @@ python do_package_deb () {
                 bb.utils.unlockfile(lf)
                 raise bb.build.FuncFailed("unable to open conffiles for writing.")
             for f in conffiles_str.split():
-                conffiles.write('%s\n' % f)
+                if os.path.exists(oe.path.join(root, f)):
+                    conffiles.write('%s\n' % f)
             conffiles.close()
 
         os.chdir(basedir)