summaryrefslogtreecommitdiff
path: root/bitbake-dev
diff options
context:
space:
mode:
authorRob Bradford <rob@linux.intel.com>2008-10-24 17:37:46 +0100
committerRob Bradford <rob@linux.intel.com>2008-10-27 10:19:55 +0000
commitf5c494bba5be9204f440c87771001300ccde900a (patch)
tree992b83e43626867a31a264635e1fa74640cbc61a /bitbake-dev
parent790ed683565e56ef513bad568de1b15d801bfe7b (diff)
downloadopenembedded-core-f5c494bba5be9204f440c87771001300ccde900a.tar.gz
openembedded-core-f5c494bba5be9204f440c87771001300ccde900a.tar.bz2
openembedded-core-f5c494bba5be9204f440c87771001300ccde900a.tar.xz
openembedded-core-f5c494bba5be9204f440c87771001300ccde900a.zip
bitbake-dev: Remove use of self.configuration.cmd as state from shell
The shell updated the self.configuration.cmd variable since commans relied on this implicit state. Since those commands now have an explicit task parameter such state manipulation is no longer necessary.
Diffstat (limited to 'bitbake-dev')
-rw-r--r--bitbake-dev/lib/bb/shell.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/bitbake-dev/lib/bb/shell.py b/bitbake-dev/lib/bb/shell.py
index 34828fe42..55bae25d4 100644
--- a/bitbake-dev/lib/bb/shell.py
+++ b/bitbake-dev/lib/bb/shell.py
@@ -151,9 +151,6 @@ class BitBakeShellCommands:
if len( names ) == 0: names = [ globexpr ]
print "SHELL: Building %s" % ' '.join( names )
- oldcmd = cooker.configuration.cmd
- cooker.configuration.cmd = cmd
-
td = taskdata.TaskData(cooker.configuration.abort)
localdata = data.createCopy(cooker.configuration.data)
data.update_data(localdata)
@@ -168,7 +165,7 @@ class BitBakeShellCommands:
if len(providers) == 0:
raise Providers.NoProvider
- tasks.append([name, "do_%s" % cooker.configuration.cmd])
+ tasks.append([name, "do_%s" % cmd])
td.add_unresolved(localdata, cooker.status)
@@ -189,7 +186,6 @@ class BitBakeShellCommands:
print "ERROR: Couldn't build '%s'" % names
last_exception = e
- cooker.configuration.cmd = oldcmd
build.usage = "<providee>"
@@ -240,18 +236,14 @@ class BitBakeShellCommands:
bf = completeFilePath( name )
print "SHELL: Calling '%s' on '%s'" % ( cmd, bf )
- oldcmd = cooker.configuration.cmd
- cooker.configuration.cmd = cmd
-
try:
- cooker.buildFile(bf)
+ cooker.buildFile(bf, cmd)
except parse.ParseError:
print "ERROR: Unable to open or parse '%s'" % bf
except build.EventException, e:
print "ERROR: Couldn't build '%s'" % name
last_exception = e
- cooker.configuration.cmd = oldcmd
fileBuild.usage = "<bbfile>"
def fileClean( self, params ):