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 1RJIt5-0003a6-CP for garchives@archives.gentoo.org; Thu, 27 Oct 2011 05:52:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8EB0421C07A; Thu, 27 Oct 2011 05:52:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5D91921C07A for ; Thu, 27 Oct 2011 05:52:16 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9FCD1B401E for ; Thu, 27 Oct 2011 05:52:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 47ABC80042 for ; Thu, 27 Oct 2011 05:52:15 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <5c216774ac90ef5d1cba6fc000baa546e7834945.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/, pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman pym/portage/repository/config.py X-VCS-Directories: bin/ pym/portage/repository/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5c216774ac90ef5d1cba6fc000baa546e7834945 Date: Thu, 27 Oct 2011 05:52:15 +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: 86d20e5cf407c3dc9ec7e8fcdf652cad commit: 5c216774ac90ef5d1cba6fc000baa546e7834945 Author: Zac Medico gentoo org> AuthorDate: Thu Oct 27 05:52:04 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Oct 27 05:52:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5c216774 repoman: add opts and repo config debug output --- bin/repoman | 3 +++ pym/portage/repository/config.py | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/bin/repoman b/bin/repoman index bf91b85..8adccc7 100755 --- a/bin/repoman +++ b/bin/repoman @@ -654,6 +654,9 @@ if vcs is None: # TODO: shouldn't this just be switched on the repo, iso the VCS? check_changelog =3D options.echangelog not in ('y', 'force') and vcs in = ('cvs', 'svn') =20 +logging.debug("repo config: %s" % (repo_config,)) +logging.debug("options: %s" % (options,)) + # Generate an appropriate PORTDIR_OVERLAY value for passing into the # profile-specific config constructor calls. env =3D os.environ.copy() diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index 5659b14..ab679f6 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -21,6 +21,7 @@ from portage.const import (MANIFEST2_HASH_FUNCTIONS, MA= NIFEST2_REQUIRED_HASH, from portage.env.loaders import KeyValuePairFileLoader from portage.util import normalize_path, writemsg, writemsg_level, shlex= _split from portage.localization import _ +from portage import _unicode_decode from portage import _unicode_encode from portage import _encodings from portage import manifest @@ -234,6 +235,19 @@ class RepoConfig(object): repo_msg.append("") return "\n".join(repo_msg) =20 + def __str__(self): + d =3D {} + for k in self.__slots__: + d[k] =3D getattr(self, k, None) + return _unicode_decode(str(d)) + + if sys.hexversion < 0x3000000: + + __unicode__ =3D __str__ + + def __str__(self): + return _unicode_encode(self.__unicode__()) + class RepoConfigLoader(object): """Loads and store config of several repositories, loaded from PORTDIR_= OVERLAY or repos.conf""" =20