diff options
| author | Bogdano Arendartchuk <bogdano@mandriva.org> | 2008-11-11 17:21:41 +0000 |
|---|---|---|
| committer | Bogdano Arendartchuk <bogdano@mandriva.org> | 2008-11-11 17:21:41 +0000 |
| commit | 3a7d4937f2fbd7b80f0762258380c82e1cbffe13 (patch) | |
| tree | 2c1c1d6e66e065d30c60079c311437f28ccb5157 /RepSys/ConfigParser.py | |
| parent | 86b2db69c2c1935ec282ef449a42349e5634a228 (diff) | |
| parent | bc9f60a727164caf513746b5fc04f999c968f799 (diff) | |
| download | mgarepo-3a7d4937f2fbd7b80f0762258380c82e1cbffe13.tar mgarepo-3a7d4937f2fbd7b80f0762258380c82e1cbffe13.tar.gz mgarepo-3a7d4937f2fbd7b80f0762258380c82e1cbffe13.tar.bz2 mgarepo-3a7d4937f2fbd7b80f0762258380c82e1cbffe13.tar.xz mgarepo-3a7d4937f2fbd7b80f0762258380c82e1cbffe13.zip | |
make the V1_6_X branch the trunk
Diffstat (limited to 'RepSys/ConfigParser.py')
| -rw-r--r-- | RepSys/ConfigParser.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/RepSys/ConfigParser.py b/RepSys/ConfigParser.py index 4dc3e3c..3b4e213 100644 --- a/RepSys/ConfigParser.py +++ b/RepSys/ConfigParser.py @@ -350,11 +350,12 @@ class Config: self._config = ConfigParser() self._wrapped = {} conffiles = [] - conffiles.append("/etc/repsys.conf") repsys_conf = os.environ.get("REPSYS_CONF") if repsys_conf: conffiles.append(repsys_conf) - conffiles.append(os.path.expanduser("~/.repsys/config")) + else: + conffiles.append("/etc/repsys.conf") + conffiles.append(os.path.expanduser("~/.repsys/config")) for file in conffiles: if os.path.isfile(file): self._config.read(file) |