summaryrefslogtreecommitdiff
path: root/classes/base.oeclass
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-25 11:54:50 +0000
committerChris Larson <clarson@kergoth.com>2004-11-25 11:54:50 +0000
commit816ba5333d871c38d6b58e55eafda7ed827a99b1 (patch)
treef60ddf2ad6dff0b5179c60b7d01746e02f258c56 /classes/base.oeclass
parent9918acbe5451abe65b61363ce851b8b16e653062 (diff)
Unapply mithro's packages.cow7.diffs cset.
BKrev: 41a5c80aodDISNWzsp_eYlw7hpu1Gw
Diffstat (limited to 'classes/base.oeclass')
-rw-r--r--classes/base.oeclass14
1 files changed, 6 insertions, 8 deletions
diff --git a/classes/base.oeclass b/classes/base.oeclass
index 4e3e17137b..35c7fbecd1 100644
--- a/classes/base.oeclass
+++ b/classes/base.oeclass
@@ -247,7 +247,7 @@ python do_showdata() {
# emit variables and shell functions
oe.data.emit_env(sys.__stdout__, d, True)
# emit the metadata which isnt valid shell
- for e in oe.data.keys(d):
+ for e in d.keys():
if oe.data.getVarFlag(e, 'python', d):
sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, oe.data.getVar(e, d, 1)))
elif oe.data.getVarFlag(e, 'func', d):
@@ -263,7 +263,7 @@ python do_listtasks() {
# emit variables and shell functions
#oe.data.emit_env(sys.__stdout__, d)
# emit the metadata which isnt valid shell
- for e in oe.data.keys(d):
+ for e in d.keys():
if oe.data.getVarFlag(e, 'task', d):
sys.__stdout__.write("%s\n" % e)
}
@@ -299,10 +299,9 @@ addtask fetch
do_fetch[dirs] = "${DL_DIR}"
do_fetch[nostamp] = "1"
python base_do_fetch() {
- import sys
+ import sys, copy
- localdata = {}
- oe.data.linkDataSet(localdata,d)
+ localdata = copy.deepcopy(d)
oe.data.update_data(localdata)
src_uri = oe.data.getVar('SRC_URI', localdata, 1)
@@ -374,10 +373,9 @@ def oe_unpack_file(file, data, url = None):
addtask unpack after do_fetch
do_unpack[dirs] = "${WORKDIR}"
python base_do_unpack() {
- import re, os
+ import re, copy, os
- localdata = {}
- oe.data.linkDataSet(localdata,d)
+ localdata = copy.deepcopy(d)
oe.data.update_data(localdata)
src_uri = oe.data.getVar('SRC_URI', localdata)