Add features flag to gmerge.

builder.py

Index: builder.py
diff --git a/builder.py b/builder.py
index bf83c3e7f82462f240e23e8b5ee52262e1c39afd..3553a6b89a6afc2e0b7c220b89def7f37c4ac8db 100644
--- a/builder.py
+++ b/builder.py
@@ -51,7 +51,7 @@ class Builder(object):
 
   def Build(self, board, pkg, additional_args):
     """Handles a build request from the cherrypy server."""
-    cherrypy.log('Additional build request arguments: '+ str(additional_args),
+    cherrypy.log('Additional build request arguments: ' + str(additional_args),
                  'BUILD')
 
     original_use = os.environ.get('USE', '')
@@ -59,6 +59,11 @@ class Builder(object):
       os.environ['USE'] = original_use + ' ' + additional_args['use']
       cherrypy.log('USE flags modified to ' + os.environ['USE'], 'BUILD')
 
+    if 'features' in additional_args:
+      os.environ['FEATURES'] = original_use + ' ' + additional_args['features']

[rochberg, 2011/04/09 19:59:34]

= original_features + ...

Probably best to switch to making a full copy of os.environ and save this whole
mess. about original_*

+      cherrypy.log('FEATURES flags modified to ' + os.environ['FEATURES'],
+                   'BUILD')
+
     try:
       if (self._ShouldBeWorkedOn(board, pkg) and
           not additional_args.get('accept_stable')):
@@ -81,4 +86,4 @@ class Builder(object):
     except OSError, e:
       return self.SetError('Could not execute build command: ' + str(e))
     finally:
-      os.environ['USE'] =  original_use
+      os.environ['USE'] = original_use

[rochberg, 2011/04/09 19:59:34]

Should also restore FEATURES, or, better yet, be more generic about the
environment restore.