summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-07 16:50:12 +0000
committerGerrit Code Review <review@openstack.org>2012-02-07 16:50:12 +0000
commitbedef20b4fdaa678017390afd616a4db41e6d949 (patch)
treed9a085ee99a81f19f0f34e4b7722b9226c0c0abe
parenta3febb16e571890911622deb12762bb46e8dfbee (diff)
parentc716c94d1db26faa59332340e9eabe03b3d41d1b (diff)
downloadnova-bedef20b4fdaa678017390afd616a4db41e6d949.tar.gz
nova-bedef20b4fdaa678017390afd616a4db41e6d949.tar.xz
nova-bedef20b4fdaa678017390afd616a4db41e6d949.zip
Merge "Fix support for --flagfile argument"
-rw-r--r--nova/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/utils.py b/nova/utils.py
index a98897d82..f9ffe3adc 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -325,7 +325,7 @@ def default_flagfile(filename='nova.conf', args=None):
args = sys.argv
for arg in args:
if arg.find('flagfile') != -1:
- return arg[arg.index('flagfile') + 1:]
+ return arg[arg.index('flagfile') + len('flagfile') + 1:]
else:
if not os.path.isabs(filename):
# turn relative filename into an absolute path