[OE-core] [CONSOLIDATED PULL 16/19] scripts/combo-layer: fix configuration file handling

Saul Wold sgw at linux.intel.com
Mon Aug 22 21:52:01 UTC 2011


From: Otavio Salvador <otavio at ossystems.com.br>

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
 scripts/combo-layer |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 07b3382..f8763ee 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -339,8 +339,8 @@ Action:
   update            get patches from component repos and apply them to the combo repo
   splitpatch [commit] generate commit patch and split per component, default commit is HEAD""")
 
-    parser.add_option("-c", "--conf", help = "specify the config file. default is conf/combolayer.conf",
-               action = "store", dest = "conffile", default = "combo-layer.conf")
+    parser.add_option("-c", "--conf", help = "specify the config file (conf/combo-layer.conf is the default).",
+               action = "store", dest = "conffile", default = "conf/combo-layer.conf")
 
     parser.add_option("-i", "--interactive", help = "interactive mode, user can edit the patch list and patches",
                action = "store_true", dest = "interactive", default = False)
-- 
1.7.6





More information about the Openembedded-core mailing list