diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-03-05 16:54:57 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-03-05 17:27:44 -0800 |
| commit | 9627c88d688fd276d82c06bb7d11aefecce5e7d4 (patch) | |
| tree | 4ed9895badeab947c76bcae024ec26bd23c23a29 /nova/compat | |
| parent | 43b52f7bd224209771245d987c3ff0f2506803ec (diff) | |
Allows new style config to be used for --flagfile
* includes tests
* fixes bug 947549
Change-Id: Ibf319ea75a2d6156c5d8f1112cd58a33e5a98fe0
Diffstat (limited to 'nova/compat')
| -rw-r--r-- | nova/compat/flagfile.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/compat/flagfile.py b/nova/compat/flagfile.py index 02d571cbf..3b5845c3d 100644 --- a/nova/compat/flagfile.py +++ b/nova/compat/flagfile.py @@ -97,6 +97,10 @@ def _read_flagfile(arg, next_arg, tempdir=None): args = _read_lines(flagfile) + if args and not args[0].startswith('--'): + # This is a config file, not a flagfile, so return it. + return ['--config-file=' + flagfile] + argp[1:] + # # We're recursing here to convert any --flagfile arguments # read from this flagfile into --config-file arguments |