Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2012-03-02 17:07:40 (GMT)
committer Daniel Drake <dsd@laptop.org>2012-03-07 16:44:10 (GMT)
commit372ce5398ef7248f8ccbba5ceeeeda696cc7a44b (patch)
tree3f40e1dcd8799d2dadfa485291de20d333bf4378 /doc
parent8fb855083fe819814c0e2eaa373cfe3aeaee8d3e (diff)
Accept multiple config files
Allow multiple config files to be specified on the command line. They will be parsed in the order specified. This replaces the additional-defaults functionality provided before.
Diffstat (limited to 'doc')
-rw-r--r--doc/README8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/README b/doc/README
index 16e6d4f..05e9e6f 100644
--- a/doc/README
+++ b/doc/README
@@ -54,7 +54,7 @@ release was made.
Usage:
- olpc-os-builder <path to build config>
+ olpc-os-builder <path to build config> [path to build config...]
Configuration:
@@ -81,6 +81,10 @@ the first one are indented, e.g.:
but lines 2 through 4 must be indented
option2=foo
+Multiple configuration files can be specified. They will be parsed in the
+order provided (i.e. later config files can override values from earlier
+ones).
+
Interpolation (basic assignment and use of variables) can be used, according
to Python's SafeConfigParser documentation.
@@ -88,7 +92,7 @@ Default variables automatically provided:
oob_config_dir
- The directory where the currently selected config file resides
+ The directory where the first specified config file resides
In general, each section that can exist in the configuration file
corresponds to a specific module. The section name is the same as the