From: Chris Larson <clarson@kergoth.com>
Date: Wed, 24 Mar 2004 03:25:35 +0000 (+0000)
Subject: BUGFIX in gtk+: s/data\./oe.data./g
X-Git-Tag: Release-2010-05/1~19897
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dbbce59d8d7bda7bec8a022c6d9b7a402767b4d;p=openembedded.git

BUGFIX in gtk+: s/data\./oe.data./g

BKrev: 4060ffafZBqdeHQ7tYwqo27cbSdsSA
---

diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe
index eab6f950f0..a78182c0b7 100644
--- a/gtk+/gtk+_2.2.4.oe
+++ b/gtk+/gtk+_2.2.4.oe
@@ -68,8 +68,9 @@ do_stage () {
 }
 
 python do_package () {
+	import string
 	def do_split(root, pattern, format, description):
-		dvar = data.getVar('D', d, 1)
+		dvar = oe.data.getVar('D', d, 1)
 		if not dvar:
 			oe.error("D not defined")
 			return
@@ -89,18 +90,18 @@ python do_package () {
 			on = m.group(1)
 			pkg = format % on	
 			packages.append(pkg)
-			data.setVar('FILES_' + pkg, os.path.join(root, o), d)
-			data.setVar('RDEPENDS_' + pkg, mainpkg, d)
-			data.setVar('DESCRIPTION_' + pkg, description % on, d)
+			oe.data.setVar('FILES_' + pkg, os.path.join(root, o), d)
+			oe.data.setVar('RDEPENDS_' + pkg, mainpkg, d)
+			oe.data.setVar('DESCRIPTION_' + pkg, description % on, d)
 								
-		data.setVar('PACKAGES', string.join(packages, ' '), d)
+		oe.data.setVar('PACKAGES', string.join(packages, ' '), d)
 
-	libdir = data.getVar('libdir', d, 1)
+	libdir = oe.data.getVar('libdir', d, 1)
 	if not libdir:
 		oe.error("libdir not defined")
 		return
 
-	gtk_libdir = os.path.join(libdir, "gtk-2.0", data.getVar('LIBV', d))
+	gtk_libdir = os.path.join(libdir, "gtk-2.0", oe.data.getVar('LIBV', d))
 	loaders_root = os.path.join(gtk_libdir, 'loaders')
 	immodules_root = os.path.join(gtk_libdir, 'immodules')