From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QG3o4-0007QA-Co for garchives@archives.gentoo.org; Sat, 30 Apr 2011 06:37:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 720FE1C008; Sat, 30 Apr 2011 06:37:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 298FA1C008 for ; Sat, 30 Apr 2011 06:37:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 30F531B400C for ; Sat, 30 Apr 2011 06:37:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4516A80505 for ; Sat, 30 Apr 2011 06:37:22 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: 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: b44b5484afd1386a17021cee2922b1330ece5f63 Date: Sat, 30 Apr 2011 06:37:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7963f75c35c7f456a6b01879ae1a349d commit: b44b5484afd1386a17021cee2922b1330ece5f63 Author: dol-sen gmail com> AuthorDate: Sat Apr 30 06:32:38 2011 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sat Apr 30 06:32:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/layman.git;a=3D= commit;h=3Db44b5484 Add empty add, sync and postsync options to the defaults so they are defi= ned. Fixes sync not working due to the addition of them in the code. --- layman/config.py | 28 ++++++++++++++++++++++++++-- 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', 's= torage', - 'svn_command', 'tar_command', 'umask', 'width'] + 'svn_command', 'tar_command', 'umask', 'width', ...] ''' self._defaults =3D {'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 =3D { 'config': config if config else self._defaults['conf= ig'],