aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordol-sen <brian.dolbec@gmail.com>2011-04-29 23:32:38 -0700
committerdol-sen <brian.dolbec@gmail.com>2011-04-29 23:32:38 -0700
commitb44b5484afd1386a17021cee2922b1330ece5f63 (patch)
treefbb9792cb497d67b5e8b440ae80862ba4e0adb44 /layman/config.py
parentmigrate to using explicit checks. (diff)
downloadlayman-b44b5484afd1386a17021cee2922b1330ece5f63.tar.gz
layman-b44b5484afd1386a17021cee2922b1330ece5f63.tar.bz2
layman-b44b5484afd1386a17021cee2922b1330ece5f63.zip
Add empty add, sync and postsync options to the defaults so they are defined.
Fixes sync not working due to the addition of them in the code.
Diffstat (limited to 'layman/config.py')
-rw-r--r--layman/config.py28
1 files changed, 26 insertions, 2 deletions
diff --git a/layman/config.py b/layman/config.py
index 1645a3c..809ca8f 100644
--- a/layman/config.py
+++ b/layman/config.py
@@ -73,7 +73,7 @@ class BareConfig(object):
['bzr_command', 'cache', 'config', 'cvs_command', 'darcs_command',
'git_command', 'local_list', 'make_conf', 'mercurial_command',
'nocheck', 'overlays', 'proxy', 'quietness', 'rsync_command', 'storage',
- 'svn_command', 'tar_command', 'umask', 'width']
+ 'svn_command', 'tar_command', 'umask', 'width', ...]
'''
self._defaults = {'config' : '/etc/layman/layman.cfg',
'storage' : '/var/lib/layman',
@@ -95,7 +95,31 @@ class BareConfig(object):
'rsync_command': '/usr/bin/rsync',
'svn_command': '/usr/bin/svn',
'tar_command': '/bin/tar',
- 'T/F_options': ['nocheck']
+ 'T/F_options': ['nocheck'],
+ 'bzr_addopts' : '',
+ 'bzr_syncopts' : '',
+ 'cvs_addopts' : '',
+ 'cvs_syncopts' : '',
+ 'darcs_addopts' : '',
+ 'darcs_syncopts' : '',
+ 'git_addopts' : '',
+ 'git_syncopts' : '',
+ 'mercurial_addopts' : '',
+ 'mercurial_syncopts' : '',
+ 'rsync_syncopts' : '',
+ 'svn_addopts' : '',
+ 'svn_syncopts' : '',
+ 'g-common_generateopts' : '',
+ 'g-common_syncopts' : '',
+ 'bzr_postsync' : '',
+ 'cvs_postsync' : '',
+ 'darcs_postsync' : '',
+ 'git_postsync' : '',
+ 'mercurial_postsync' : '',
+ 'rsync_postsync' : '',
+ 'svn_postsync' : '',
+ 'tar_postsync' : '',
+ 'g-common_postsync' : '',
}
self._options = {
'config': config if config else self._defaults['config'],