[gentoo-commits] proj/layman:master commit in: layman/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     3168bb034ecb82785143a0e23e4b3ac91cf76508
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 14:07:48 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Aug 18 14:07:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=3168bb03

reduce indent level

---
 layman/config.py | 137 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 70 insertions(+), 67 deletions(-)

diff --git a/layman/config.py b/layman/config.py
index 44a419d..9586835 100644
--- a/layman/config.py
+++ b/layman/config.py
@@ -93,74 +93,77 @@ class BareConfig(object):
             self.root = root
 
         self._defaults = {
-                    'configdir': path([self.root, EPREFIX,'/etc/layman']),
-                    'config'    : '%(configdir)s/layman.cfg',
-                    'storage'   : path([self.root, EPREFIX,'/var/lib/layman']),
-                    'cache'     : '%(storage)s/cache',
-                    'local_list': '%(storage)s/overlays.xml',
-                    'installed': '%(storage)s/installed.xml',
-                    'make_conf' : '%(storage)s/make.conf',
-                    'nocheck'   : 'yes',
-                    'http_proxy'     : '',
-                    'https_proxy'     : '',
-                    'umask'     : '0022',
-                    'news_reporter': 'portage',
-                    'custom_news_pkg': '',
-                    'gpg_detached_lists': 'https://api.gentoo.org/overlays/repositories.xml https://api.gentoo.org/overlays/repositories.xml.asc',
-                    'gpg_signed_lists': '',
-                    'overlays'  :
-                    'https://api.gentoo.org/overlays/repositories.xml',
-                    'overlay_defs': '%(configdir)s/overlays',
-                    'bzr_command': path([self.root, EPREFIX,'/usr/bin/bzr']),
-                    'cvs_command': path([self.root, EPREFIX,'/usr/bin/cvs']),
-                    'darcs_command': path([self.root, EPREFIX,'/usr/bin/darcs']),
-                    'git_command': path([self.root, EPREFIX,'/usr/bin/git']),
-                    'g-common_command': path([self.root, EPREFIX,'/usr/bin/g-common']),
-                    'mercurial_command': path([self.root, EPREFIX,'/usr/bin/hg']),
-                    'rsync_command': path([self.root, EPREFIX,'/usr/bin/rsync']),
-                    'svn_command': path([self.root, EPREFIX,'/usr/bin/svn']),
-                    'tar_command': path([self.root, EPREFIX,'/bin/tar']),
-                    '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' : '',
-                    'git_user': 'layman',
-                    'git_email': 'layman@localhost',
-                    }
+            'configdir': path([self.root, EPREFIX,'/etc/layman']),
+            'config'    : '%(configdir)s/layman.cfg',
+            'storage'   : path([self.root, EPREFIX,'/var/lib/layman']),
+            'cache'     : '%(storage)s/cache',
+            'local_list': '%(storage)s/overlays.xml',
+            'installed': '%(storage)s/installed.xml',
+            'make_conf' : '%(storage)s/make.conf',
+            'repos_conf': '/etc/portage/repos.conf/layman.conf',
+            'conf_module': ['make_conf', 'repos_conf'],
+            'nocheck'   : 'yes',
+            'http_proxy'     : '',
+            'https_proxy'     : '',
+            'umask'     : '0022',
+            'news_reporter': 'portage',
+            'custom_news_pkg': '',
+            'gpg_detached_lists':
+                'https://api.gentoo.org/overlays/repositories.xml https://api.gentoo.org/overlays/repositories.xml.asc',
+            'gpg_signed_lists': '',
+            'overlays'  :
+                'https://api.gentoo.org/overlays/repositories.xml',
+            'overlay_defs': '%(configdir)s/overlays',
+            'bzr_command': path([self.root, EPREFIX,'/usr/bin/bzr']),
+            'cvs_command': path([self.root, EPREFIX,'/usr/bin/cvs']),
+            'darcs_command': path([self.root, EPREFIX,'/usr/bin/darcs']),
+            'git_command': path([self.root, EPREFIX,'/usr/bin/git']),
+            'g-common_command': path([self.root, EPREFIX,'/usr/bin/g-common']),
+            'mercurial_command': path([self.root, EPREFIX,'/usr/bin/hg']),
+            'rsync_command': path([self.root, EPREFIX,'/usr/bin/rsync']),
+            'svn_command': path([self.root, EPREFIX,'/usr/bin/svn']),
+            'tar_command': path([self.root, EPREFIX,'/bin/tar']),
+            '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' : '',
+            'git_user': 'layman',
+            'git_email': 'layman@localhost',
+            }
         self._options = {
-                    'config': config if config else self._defaults['config'],
-                    'stdout': stdout if stdout else sys.stdout,
-                    'stdin': stdin if stdin else sys.stdin,
-                    'stderr': stderr if stderr else sys.stderr,
-                    'output': output if output else Message(),
-                    'quietness': quietness,
-                    'nocolor': nocolor,
-                    'width': width,
-                    'verbose': verbose,
-                    'quiet': quiet,
-                    'custom_news_func': None,
-                    }
+            'config': config if config else self._defaults['config'],
+            'stdout': stdout if stdout else sys.stdout,
+            'stdin': stdin if stdin else sys.stdin,
+            'stderr': stderr if stderr else sys.stderr,
+            'output': output if output else Message(),
+            'quietness': quietness,
+            'nocolor': nocolor,
+            'width': width,
+            'verbose': verbose,
+            'quiet': quiet,
+            'custom_news_func': None,
+            }
         self._set_quietness(quietness)
         self.config = None
         if read_configfile: