Attachment #290979 for bug #388587

View | Details | Raw Unified | Return to bug 388587
Collapse All | Expand All

Lines 654-659 if vcs is None: Link Here

(-)a/bin/repoman (+3 lines)
654	# TODO: shouldn't this just be switched on the repo, iso the VCS?	654	# TODO: shouldn't this just be switched on the repo, iso the VCS?
655	check_changelog = options.echangelog not in ('y', 'force') and vcs in ('cvs', 'svn')	655	check_changelog = options.echangelog not in ('y', 'force') and vcs in ('cvs', 'svn')
656		656
		657	logging.debug("repo config: %s" % (repo_config,))
		658	logging.debug("options: %s" % (options,))
		659
657	# Generate an appropriate PORTDIR_OVERLAY value for passing into the	660	# Generate an appropriate PORTDIR_OVERLAY value for passing into the
658	# profile-specific config constructor calls.	661	# profile-specific config constructor calls.
659	env = os.environ.copy()	662	env = os.environ.copy()




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

		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"""

- 

Return to bug 388587

Lines 21-26 from portage.const import (MANIFEST2_HASH_FUNCTIONS, MANIFEST2_REQUIRED_HASH, Link Here

(-)a/pym/portage/repository/config.py (-1 / +14 lines)
21	from portage.env.loaders import KeyValuePairFileLoader	21	from portage.env.loaders import KeyValuePairFileLoader
22	from portage.util import normalize_path, writemsg, writemsg_level, shlex_split	22	from portage.util import normalize_path, writemsg, writemsg_level, shlex_split
23	from portage.localization import _	23	from portage.localization import _
		24	from portage import _unicode_decode
24	from portage import _unicode_encode	25	from portage import _unicode_encode
25	from portage import _encodings	26	from portage import _encodings
26	from portage import manifest	27	from portage import manifest
Lines 234-239 class RepoConfig(object): Link Here
234	repo_msg.append("")	235	repo_msg.append("")
235	return "\n".join(repo_msg)	236	return "\n".join(repo_msg)
236		237
		238	def __str__(self):
		239	d = {}
		240	for k in self.__slots__:
		241	d[k] = getattr(self, k, None)
		242	return _unicode_decode(str(d))
		243
		244	if sys.hexversion < 0x3000000:
		245
		246	__unicode__ = __str__
		247
		248	def __str__(self):
		249	return _unicode_encode(self.__unicode__())
		250
237	class RepoConfigLoader(object):	251	class RepoConfigLoader(object):
238	"""Loads and store config of several repositories, loaded from PORTDIR_OVERLAY or repos.conf"""	252	"""Loads and store config of several repositories, loaded from PORTDIR_OVERLAY or repos.conf"""
239		253
240	-