| 1 |
commit: b44b5484afd1386a17021cee2922b1330ece5f63 |
| 2 |
Author: dol-sen <brian.dolbec <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Apr 30 06:32:38 2011 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Apr 30 06:32:38 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=b44b5484 |
| 7 |
|
| 8 |
Add empty add, sync and postsync options to the defaults so they are defined. |
| 9 |
Fixes sync not working due to the addition of them in the code. |
| 10 |
|
| 11 |
--- |
| 12 |
layman/config.py | 28 ++++++++++++++++++++++++++-- |
| 13 |
1 files changed, 26 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/layman/config.py b/layman/config.py |
| 16 |
index 1645a3c..809ca8f 100644 |
| 17 |
--- a/layman/config.py |
| 18 |
+++ b/layman/config.py |
| 19 |
@@ -73,7 +73,7 @@ class BareConfig(object): |
| 20 |
['bzr_command', 'cache', 'config', 'cvs_command', 'darcs_command', |
| 21 |
'git_command', 'local_list', 'make_conf', 'mercurial_command', |
| 22 |
'nocheck', 'overlays', 'proxy', 'quietness', 'rsync_command', 'storage', |
| 23 |
- 'svn_command', 'tar_command', 'umask', 'width'] |
| 24 |
+ 'svn_command', 'tar_command', 'umask', 'width', ...] |
| 25 |
''' |
| 26 |
self._defaults = {'config' : '/etc/layman/layman.cfg', |
| 27 |
'storage' : '/var/lib/layman', |
| 28 |
@@ -95,7 +95,31 @@ class BareConfig(object): |
| 29 |
'rsync_command': '/usr/bin/rsync', |
| 30 |
'svn_command': '/usr/bin/svn', |
| 31 |
'tar_command': '/bin/tar', |
| 32 |
- 'T/F_options': ['nocheck'] |
| 33 |
+ 'T/F_options': ['nocheck'], |
| 34 |
+ 'bzr_addopts' : '', |
| 35 |
+ 'bzr_syncopts' : '', |
| 36 |
+ 'cvs_addopts' : '', |
| 37 |
+ 'cvs_syncopts' : '', |
| 38 |
+ 'darcs_addopts' : '', |
| 39 |
+ 'darcs_syncopts' : '', |
| 40 |
+ 'git_addopts' : '', |
| 41 |
+ 'git_syncopts' : '', |
| 42 |
+ 'mercurial_addopts' : '', |
| 43 |
+ 'mercurial_syncopts' : '', |
| 44 |
+ 'rsync_syncopts' : '', |
| 45 |
+ 'svn_addopts' : '', |
| 46 |
+ 'svn_syncopts' : '', |
| 47 |
+ 'g-common_generateopts' : '', |
| 48 |
+ 'g-common_syncopts' : '', |
| 49 |
+ 'bzr_postsync' : '', |
| 50 |
+ 'cvs_postsync' : '', |
| 51 |
+ 'darcs_postsync' : '', |
| 52 |
+ 'git_postsync' : '', |
| 53 |
+ 'mercurial_postsync' : '', |
| 54 |
+ 'rsync_postsync' : '', |
| 55 |
+ 'svn_postsync' : '', |
| 56 |
+ 'tar_postsync' : '', |
| 57 |
+ 'g-common_postsync' : '', |
| 58 |
} |
| 59 |
self._options = { |
| 60 |
'config': config if config else self._defaults['config'], |
Archives