[oe-commits] Richard Purdie : gconf.bbclass: Sync with Poky

[git version control]

Module: openembedded.git
Branch: rpurdie/work-in-progress
Commit: 79b84d738429399ec71939626323977ede5b388f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=79b84d738429399ec71939626323977ede5b388f

Author: Richard Purdie <rpurdie at linux.intel.com>
Date:   Thu Dec 17 21:48:07 2009 +0000

gconf.bbclass: Sync with Poky

* Only add the postinstall script header if an existing postinstall isn't set
* Remove the unneeded python import
* Fix the indentation in the postinstall function

Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>

---

 classes/gconf.bbclass |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass
index f55ae2c..30e7ef7 100644
--- a/classes/gconf.bbclass
+++ b/classes/gconf.bbclass
@@ -5,14 +5,14 @@ if [ "$1" = configure ]; then
 	if [ "x$D" != "x" ]; then
 		exit 1
 	fi
-        SCHEMA_LOCATION=/etc/gconf/schemas
-        for SCHEMA in ${SCHEMA_FILES}; do
-                if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then
-                        HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-                                gconftool-2 \
-                                --makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null
-                fi
-        done
+	SCHEMA_LOCATION=/etc/gconf/schemas
+	for SCHEMA in ${SCHEMA_FILES}; do
+		if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then
+			HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
+				gconftool-2 \
+				--makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null
+		fi
+	done
 fi
 }
 
@@ -30,7 +30,7 @@ fi
 }
 
 python populate_packages_append () {
-	import os.path, re
+	import re
 	packages = bb.data.getVar('PACKAGES', d, 1).split()
 	pkgdest =  bb.data.getVar('PKGDEST', d, 1)
 	
@@ -45,10 +45,9 @@ python populate_packages_append () {
 		if schemas != []:
 			bb.note("adding gconf postinst and prerm scripts to %s" % pkg)
 			bb.data.setVar('SCHEMA_FILES', " ".join(schemas), d)
-			postinst = '#!/bin/sh\n'
-			pkgpostinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
-			if pkgpostinst:
-				postinst += pkgpostinst
+			postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
+			if not postinst:
+				postinst = '#!/bin/sh\n'
 			postinst += bb.data.getVar('gconf_postinst', d, 1)
 			bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 			prerm = bb.data.getVar('pkg_prerm_%s' % pkg, d, 1) or bb.data.getVar('pkg_prerm', d, 1)