[oe-commits] Richard Purdie : Revert "package_rpm.bbclass: support packaging of symlinks to directories"

[git at git.openembedded.org]

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

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sun Mar  1 12:10:43 2015 +0000

Revert "package_rpm.bbclass: support packaging of symlinks to directories"

This reverts commit 9c4ab427b6acbc3f708860adace65393562227a7.

---

 meta/classes/package_rpm.bbclass | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index e305e8b..b87e634 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -197,16 +197,6 @@ python write_specfile () {
             if path.endswith("DEBIAN") or path.endswith("CONTROL"):
                 continue
 
-            # Treat all symlinks to directories as normal files.
-            # os.walk() lists them as directories.
-            def move_to_files(dir):
-                if os.path.islink(os.path.join(rootpath, dir)):
-                    files.append(dir)
-                    return True
-                else:
-                    return False
-            dirs[:] = [dir for dir in dirs if not move_to_files(dir)]
-
             # Directory handling can happen in two ways, either DIRFILES is not set at all
             # in which case we fall back to the older behaviour of packages owning all their
             # directories