From a47597a2d0f568c763eb7180b0c7fead41d87275 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Sat, 7 Apr 2007 16:52:48 +0000 Subject: Fix option parsing (further resolve Ticket #423) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3027 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Options.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/Options.py b/src/lib/Options.py index cfc9f3ddc..02815ba24 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -70,10 +70,10 @@ class BasicOptionParser: else: ret[key] = sys.argv[sys.argv.index(option[0]) + 1] continue - elif envvar and os.environ.has_key(envvar): + if envvar and os.environ.has_key(envvar): ret[key] = os.environ[envvar] continue - elif self.configfile and cfpath: + if self.configfile and cfpath: try: value = apply(cf.get, cfpath) ret[key] = value -- cgit v1.2.3-1-g7c22