diff options
| author | Kevin Vigor <kvigor@fb.com> | 2017-01-05 12:21:20 -0800 |
|---|---|---|
| committer | Kevin Vigor <kvigor@fb.com> | 2017-01-05 12:21:20 -0800 |
| commit | c27aa58e72cf528583c585691e65abdb765535e5 (patch) | |
| tree | fae75e5b924ac4fb80a3d4ed42203638732fbb52 /geo-replication/syncdaemon/gsyncd.py | |
| parent | 63403742f53ec59a6acbe26ff4c39bab1b0842ed (diff) | |
| parent | cb8bc3396d16e777d9a2683886fefd43e747e8a3 (diff) | |
Merge remote-tracking branch 'origin/release-3.8' into merge-3.8-again
Change-Id: I844adf2aef161a44d446f8cd9b7ebcb224ee618a
Signed-off-by: Kevin Vigor <kvigor@fb.com>
Diffstat (limited to 'geo-replication/syncdaemon/gsyncd.py')
| -rw-r--r-- | geo-replication/syncdaemon/gsyncd.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/geo-replication/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py index b459abcccee..6591716056c 100644 --- a/geo-replication/syncdaemon/gsyncd.py +++ b/geo-replication/syncdaemon/gsyncd.py @@ -539,7 +539,10 @@ def main_i(): if not 'config_file' in rconf: rconf['config_file'] = TMPL_CONFIG_FILE - upgrade_config_file(rconf['config_file'], confdata) + # Upgrade Config File only if it is session conf file + if rconf['config_file'] != TMPL_CONFIG_FILE: + upgrade_config_file(rconf['config_file'], confdata) + gcnf = GConffile( rconf['config_file'], canon_peers, confdata, defaults.__dict__, opts.__dict__, namedict) |