From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 3 Feb 2013 17:29:04 +0000 (+0000)
Subject: package.bbclass: Simplify empty directory removal
X-Git-Tag: rev_ivi_2015_02_04~13834
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63a11fa5a0416b5735feb0d7cce14fb47bf67fd4;p=scm%2Fbb%2Ftizen-distro.git

package.bbclass: Simplify empty directory removal

Rather than an exec() per directory, we might as well exec one command and
be done with it.

(From OE-Core rev: 82ae9cfb09ee5c0aa6402c972d71e2b64d1ce8bc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 6ec028b..a93fef9 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -298,11 +298,7 @@ def copydebugsources(debugsrcdir, d):
         subprocess.call(processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir), shell=True)
 
         # The copy by cpio may have resulted in some empty directories!  Remove these
-        for root, dirs, files in os.walk("%s%s" % (dvar, debugsrcdir)):
-            for d in dirs:
-                dir = os.path.join(root, d)
-                #bb.note("rmdir -p %s" % dir)
-                subprocess.call("rmdir -p %s 2>/dev/null" % dir, shell=True)
+        subprocess.call("find %s%s -empty -type d -delete" % (dvar, debugsrcdir), shell=True)
 
         # Also remove debugsrcdir if its empty
         for p in nosuchdir[::-1]: