From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 6 Jul 2011 19:39:41 +0000 (+0200)
Subject: build-essentials: Add /usr/lib/python* to possibly orphaned directories.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20c47b224454f76ea3ed0b0ca6a34031252fcd2a;p=ipfire-3.x.git

build-essentials: Add /usr/lib/python* to possibly orphaned directories.
---

diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index 3164b8e34..1034d6b50 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = build-essentials
 PKG_VER        = $(DISTRO_VERSION)
-PKG_REL        = 18
+PKG_REL        = 19
 PKG_EPOCH      = 1
 PKG_ARCH       = noarch
 
diff --git a/pkgs/build-essentials/buildsystem-tools/cleanup b/pkgs/build-essentials/buildsystem-tools/cleanup
new file mode 100755
index 000000000..49e7c1bd0
--- /dev/null
+++ b/pkgs/build-essentials/buildsystem-tools/cleanup
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+dirname=$(dirname ${0})
+
+. ${dirname}/common-functions
+
+directory_remove_orphans $@
diff --git a/pkgs/build-essentials/buildsystem-tools/functions-constants b/pkgs/build-essentials/buildsystem-tools/functions-constants
index 396e045ed..80256f9ff 100644
--- a/pkgs/build-essentials/buildsystem-tools/functions-constants
+++ b/pkgs/build-essentials/buildsystem-tools/functions-constants
@@ -17,4 +17,5 @@ for i in $(seq 0 9); do
 	ORPHAN_CANDIDATES="${ORPHAN_CANDIDATES} /usr/share/man/man${i}"
 done
 ORPHAN_CANDIDATES="${ORPHAN_CANDIDATES} /usr/lib/pkgconfig"
+ORPHAN_CANDIDATES="${ORPHAN_CANDIDATES} /usr/lib/python*"
 
diff --git a/pkgs/build-essentials/buildsystem-tools/functions-directories b/pkgs/build-essentials/buildsystem-tools/functions-directories
index 5b0867b7a..e779d75b2 100644
--- a/pkgs/build-essentials/buildsystem-tools/functions-directories
+++ b/pkgs/build-essentials/buildsystem-tools/functions-directories
@@ -10,15 +10,19 @@ function directory_remove_orphans() {
 	log DEBUG "Removing orphans in ${basedir}"
 
 	local dir
-	for dir in ${ORPHAN_CANDIDATES}; do
-		dir="${basedir}/${dir}"
+	local dir_pattern
+	for dir_pattern in ${ORPHAN_CANDIDATES}; do
+		dir=$(echo ${basedir}/${dir_pattern})
 
-		[ -d "${dir}" ] || continue
+		for dir in ${dir}; do
+			echo "DIR ${dir}" >&2
+			[ -d "${dir}" ] || continue
 
-		if dir_is_empty ${dir}; then
-			log DEBUG "  Found orphaned directory: ${dir}"
-			rm -rf ${dir}
-		fi
+			if dir_is_empty ${dir}; then
+				log DEBUG "  Found orphaned directory: ${dir}"
+				rm -rf ${dir}
+			fi
+		done
 	done
 }