summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2009-06-01 13:26:28 -0400
committerBill Peck <bpeck@redhat.com>2009-06-01 13:26:28 -0400
commit1ff4d64dddde5cecf2e7f76cb6f1eef84c596413 (patch)
tree29d57358aad39b277a6727d39379962ece1e5334
parent7e5bc4263e02d024143a4d478ccdc8b9b23e9496 (diff)
fix beaker client to find the config file correctly
-rw-r--r--Client/src/beaker/client/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Client/src/beaker/client/__init__.py b/Client/src/beaker/client/__init__.py
index e88ad31..eba9bd3 100644
--- a/Client/src/beaker/client/__init__.py
+++ b/Client/src/beaker/client/__init__.py
@@ -5,8 +5,10 @@ from kobo.client import ClientCommand
class BeakerCommand(ClientCommand):
enabled = False
+ conf_environ_key = 'beaker_config'
user_conf = os.path.expanduser('~/.beaker')
if os.path.exists(user_conf):
- conf_environ_key = user_conf
+ conf = user_conf
else:
- conf_environ_key = "/etc/beaker/client.conf"
+ conf = "/etc/beaker/client.conf"
+ os.environ['beaker_config'] = conf