diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-04-07 16:52:48 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-04-07 16:52:48 +0000 |
| commit | a47597a2d0f568c763eb7180b0c7fead41d87275 (patch) | |
| tree | 76766f0546a2f274fbbe295a46616da14c42b751 | |
| parent | d5e2badffb07522f72f46ac173b07f2445c82a7a (diff) | |
| download | bcfg2-a47597a2d0f568c763eb7180b0c7fead41d87275.tar.gz bcfg2-a47597a2d0f568c763eb7180b0c7fead41d87275.tar.bz2 bcfg2-a47597a2d0f568c763eb7180b0c7fead41d87275.zip | |
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
| -rw-r--r-- | src/lib/Options.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |