From 22c29d8651668195f72e2f6a8e059d625eb511c3 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 20 Jan 2010 18:46:02 +0000
Subject: bitbake: Switch to bitbake-dev version (bitbake master upstream)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 bitbake/lib/bb/shell.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'bitbake/lib/bb/shell.py')

diff --git a/bitbake/lib/bb/shell.py b/bitbake/lib/bb/shell.py
index b1ad78306d..66e51719a4 100644
--- a/bitbake/lib/bb/shell.py
+++ b/bitbake/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>"
 
@@ -208,6 +204,11 @@ class BitBakeShellCommands:
         self.build( params, "configure" )
     configure.usage = "<providee>"
 
+    def install( self, params ):
+        """Execute 'install' on a providee"""
+        self.build( params, "install" )
+    install.usage = "<providee>"
+
     def edit( self, params ):
         """Call $EDITOR on a providee"""
         name = params[0]
@@ -240,18 +241,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 ):
@@ -493,7 +490,7 @@ SRC_URI = ""
         interpreter.interact( "SHELL: Expert Mode - BitBake Python %s\nType 'help' for more information, press CTRL-D to switch back to BBSHELL." % sys.version )
 
     def showdata( self, params ):
-        """Show the parsed metadata for a given providee"""
+        """Execute 'showdata' on a providee"""
         cooker.showEnvironment(None, params)
     showdata.usage = "<providee>"
 
-- 
cgit v1.2.3