From: Ross Burton <ross.burton@intel.com>
Date: Fri, 15 Feb 2013 13:03:51 +0000 (+0000)
Subject: package_deb: check CONFFILES exist before adding them to metadata
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f017eb38bbca4af106ed359adfbbd4bfdf9bad5c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

(From OE-Core rev: 767a3d1c45f97add720174a7034df750bfb09a8e)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 12e01d1d5ec..eea15e722ff 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)