From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8FAAC1381F3 for ; Sun, 18 Aug 2013 14:48:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CF15E0BC1; Sun, 18 Aug 2013 14:48:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86F14E0BC1 for ; Sun, 18 Aug 2013 14:48:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45A3333EAF5 for ; Sun, 18 Aug 2013 14:48:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AD6C7E468F for ; Sun, 18 Aug 2013 14:48:01 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1376834868.3168bb034ecb82785143a0e23e4b3ac91cf76508.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/config.py X-VCS-Directories: layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 3168bb034ecb82785143a0e23e4b3ac91cf76508 X-VCS-Branch: master Date: Sun, 18 Aug 2013 14:48:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8ad41837-fe62-4cca-b058-5f483e9b4994 X-Archives-Hash: 9c7112fec82029574f74bf7c0b09367f commit: 3168bb034ecb82785143a0e23e4b3ac91cf76508 Author: Brian Dolbec gentoo org> AuthorDate: Sun Aug 18 14:07:48 2013 +0000 Commit: Brian Dolbec gmail 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: