summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Options.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-05-20 09:27:57 -0500
committerSol Jerome <sol.jerome@gmail.com>2012-05-20 09:27:57 -0500
commitd08c7dd432cabe19c652ab69c8a19852a9b797bd (patch)
treed1c3d58bc359d8b421007cba7ca0686a349e8478 /src/lib/Bcfg2/Options.py
parentb164acda71fec60d35acd8dfb00b36e4fadcf801 (diff)
downloadbcfg2-d08c7dd432cabe19c652ab69c8a19852a9b797bd.tar.gz
bcfg2-d08c7dd432cabe19c652ab69c8a19852a9b797bd.tar.bz2
bcfg2-d08c7dd432cabe19c652ab69c8a19852a9b797bd.zip
Options: Add vim temporary files to ignore list
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Options.py')
-rw-r--r--src/lib/Bcfg2/Options.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index 129a6c31e..551a4fe42 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -150,7 +150,6 @@ class OptionSet(dict):
self.hm = self.buildHelpMessage()
if 'configfile' in kwargs:
self.cfile = kwargs['configfile']
- os.environ['BCFG2_CONFIG_FILE'] = self.cfile
else:
self.cfile = DEFAULT_CONFIG_LOCATION
self.cfp = DefaultConfigParser()
@@ -311,8 +310,8 @@ SERVER_FILEMONITOR = Option('Server file monitor', cf=('server', 'filemonitor'),
default='default', odesc='File monitoring driver')
SERVER_FAM_IGNORE = Option('File globs to ignore',
cf=('server', 'ignore_files'), cook=list_split,
- default=['*~', '.#*', '*#', '*.swp', 'SCCS', '.svn',
- '4913', '.gitignore'])
+ default=['*~', '.#*', '*#', '*.swp', '.*.swx', 'SCCS',
+ '.svn', '4913', '.gitignore'])
SERVER_LISTEN_ALL = Option('Listen on all interfaces',
cf=('server', 'listen_all'),
cmd='--listen-all',