diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2011-08-19 15:07:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-23 18:23:34 -0700 |
commit | 1eb4426599ca86c77ab08c5184f6011d09aec314 (patch) | |
tree | d62827730f5bac779baedfcc5b077ae69b8eaa6b /scripts | |
parent | 6f5066a3a012ebc2eb82c92b6808582397e304b4 (diff) | |
download | poky-1eb4426599ca86c77ab08c5184f6011d09aec314.tar.gz |
scripts/combo-layer: fix configuration file handling
(From OE-Core rev: e83017fe9e1dc89860a43d41d0480d1371539e44)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/combo-layer | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 07b3382f0a..f8763ee26a 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
@@ -339,8 +339,8 @@ Action: | |||
339 | update get patches from component repos and apply them to the combo repo | 339 | update get patches from component repos and apply them to the combo repo |
340 | splitpatch [commit] generate commit patch and split per component, default commit is HEAD""") | 340 | splitpatch [commit] generate commit patch and split per component, default commit is HEAD""") |
341 | 341 | ||
342 | parser.add_option("-c", "--conf", help = "specify the config file. default is conf/combolayer.conf", | 342 | parser.add_option("-c", "--conf", help = "specify the config file (conf/combo-layer.conf is the default).", |
343 | action = "store", dest = "conffile", default = "combo-layer.conf") | 343 | action = "store", dest = "conffile", default = "conf/combo-layer.conf") |
344 | 344 | ||
345 | parser.add_option("-i", "--interactive", help = "interactive mode, user can edit the patch list and patches", | 345 | parser.add_option("-i", "--interactive", help = "interactive mode, user can edit the patch list and patches", |
346 | action = "store_true", dest = "interactive", default = False) | 346 | action = "store_true", dest = "interactive", default = False) |