diff options
| -rwxr-xr-x | bin/repoman | 3 | ||||
| -rw-r--r-- | pym/portage/repository/config.py | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/bin/repoman b/bin/repoman index bf91b85a9..8adccc774 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 = options.echangelog not in ('y', 'force') and vcs in ('cvs', 'svn') +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 = os.environ.copy() diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 5659b14da..ab679f6fb 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -21,6 +21,7 @@ from portage.const import (MANIFEST2_HASH_FUNCTIONS, MANIFEST2_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) + def __str__(self): + d = {} + for k in self.__slots__: + d[k] = getattr(self, k, None) + return _unicode_decode(str(d)) + + if sys.hexversion < 0x3000000: + + __unicode__ = __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""" |