[gentoo-commits] proj/portage:master commit in: bin/, pym/repoman/, pym/portage/repository/, misc/, pym/portage/dbapi/, ...

[Michał Górny]

commit:     18692ada8579d367eb332fad7bfe273100f9638f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 15:32:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 07:33:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=18692ada

Revert "portage.repository.config: Clean reading of repository (...) "

This reverts commit 2cde1f65e9c585e78415857fdcac1fe5deaa60da. This was
unreviewed and is a breaking change made without any discussion or
announcement.

 bin/emerge-webrsync              |   4 +-
 bin/portageq                     |   4 -
 misc/emerge-delta-webrsync       |   4 +-
 pym/_emerge/actions.py           |  33 ++++++
 pym/portage/dbapi/porttree.py    |   4 +-
 pym/portage/repository/config.py | 229 ++++++++++++++++++++++-----------------
 pym/repoman/repos.py             |   6 +-
 7 files changed, 171 insertions(+), 113 deletions(-)

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index fc5ab95..9961ad8 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Author: Karl Trygve Kalleberg <karltk@g.o>
 # Rewritten from the old, Perl-based emerge-webrsync script
@@ -39,7 +39,7 @@ else
 	eecho "could not find 'portageq'; aborting"
 	exit 1
 fi
-eval "$(PORTAGE_SYNC_MODE=1 "${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
+eval "$("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
 	FETCHCOMMAND GENTOO_MIRRORS \
 	PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \
 	PORTAGE_NICENESS PORTAGE_REPOSITORIES PORTAGE_RSYNC_EXTRA_OPTS \

diff --git a/bin/portageq b/bin/portageq
index 12886f0..925640b 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -66,10 +66,6 @@ def uses_eroot(function):
 	function.uses_eroot = True
 	return function
 
-# Workaround until emerge-webrsync and emerge-delta-webrsync are rewritten in Python.
-if os.environ.get("PORTAGE_SYNC_MODE") == "1":
-	portage._sync_mode = True
-
 # global to hold all function docstrings to be used for argparse help.
 # Avoids python compilation level 2 optimization troubles.
 docstrings = {}

diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
index 1cc04bd..f2dc822 100755
--- a/misc/emerge-delta-webrsync
+++ b/misc/emerge-delta-webrsync
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Author: Brian Harring <ferringb@g.o>, karltk@g.o originally.
 # Rewritten from the old, Perl-based emerge-webrsync script
@@ -36,7 +36,7 @@ else
 	eecho "could not find 'portageq'; aborting"
 	exit 1
 fi
-eval "$(PORTAGE_SYNC_MODE=1 "${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
+eval "$("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
 	FETCHCOMMAND GENTOO_MIRRORS \
 	PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \
 	PORTAGE_NICENESS PORTAGE_REPOSITORIES PORTAGE_RSYNC_EXTRA_OPTS \

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index a080ba4..c3b0b98 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2693,6 +2693,38 @@ def expand_set_arguments(myfiles, myaction, root_config):
 			newargs.append(a)
 	return (newargs, retval)
 
+def repo_name_check(trees):
+	missing_repo_names = set()
+	for root_trees in trees.values():
+		porttree = root_trees.get("porttree")
+		if porttree:
+			portdb = porttree.dbapi
+			missing_repo_names.update(portdb.getMissingRepoNames())
+
+	# Skip warnings about missing repo_name entries for
+	# /usr/local/portage (see bug #248603).
+	try:
+		missing_repo_names.remove('/usr/local/portage')
+	except KeyError:
+		pass
+
+	if missing_repo_names:
+		msg = []
+		msg.append("WARNING: One or more repositories " + \
+			"have missing repo_name entries:")
+		msg.append("")
+		for p in missing_repo_names:
+			msg.append("\t%s/profiles/repo_name" % (p,))
+		msg.append("")
+		msg.extend(textwrap.wrap("NOTE: Each repo_name entry " + \
+			"should be a plain text file containing a unique " + \
+			"name for the repository on the first line.", 70))
+		msg.append("\n")
+		writemsg_level("".join("%s\n" % l for l in msg),
+			level=logging.WARNING, noiselevel=-1)
+
+	return bool(missing_repo_names)
+
 def repo_name_duplicate_check(trees):
 	ignored_repos = {}
 	for root, root_trees in trees.items():
@@ -2810,6 +2842,7 @@ def run_action(emerge_config):
 	if "--quiet" not in emerge_config.opts:
 		portage.deprecated_profile_check(
 			settings=emerge_config.target_config.settings)
+		repo_name_check(emerge_config.trees)
 		repo_name_duplicate_check(emerge_config.trees)
 		config_protect_check(emerge_config.trees)
 	check_procfs()

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 0b8034e..23f3169 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -354,9 +354,7 @@ class portdbapi(dbapi):
 		"""
 		Returns a list of repository paths that lack profiles/repo_name.
 		"""
-		warnings.warn("portage.dbapi.porttree.portdbapi.getMissingRepoNames() is deprecated",
-			DeprecationWarning, stacklevel=2)
-		return frozenset()
+		return self.settings.repositories.missing_repo_names
 
 	def getIgnoredRepos(self):
 		"""

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index fff619f..97f45d4 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -21,7 +21,6 @@ import portage
 from portage import eclass_cache, os
 from portage.const import (MANIFEST2_HASH_FUNCTIONS, MANIFEST2_REQUIRED_HASH,
 	PORTAGE_BASE_PATH, REPO_NAME_LOC, USER_CONFIG_PATH)
-from portage.dep import _repo_name_re
 from portage.eapi import eapi_allows_directories_on_profile_level_and_repository_level
 from portage.env.loaders import KeyValuePairFileLoader
 from portage.util import (normalize_path, read_corresponding_eapi_file, shlex_split,
@@ -53,36 +52,6 @@ _repo_name_sub_re = re.compile(r'[^\w-]')
 
 _repo_attr_override_var_re = re.compile(r'^PORTAGE_REPOSITORY:([^:]+):([^:]+)$')
 
-def _read_repo_name(repo_location, quiet=False):
-	layout_data = _read_layout_conf(repo_location)[0]
-	repo_name = layout_data.get("repo-name")
-	if repo_name is not None:
-		if _repo_name_re.match(repo_name) is None:
-			if not quiet:
-				writemsg_level("!!! %s\n" % _("Repository name set in 'repo-name' attribute in %r is invalid: %r") %
-					(os.path.join(repo_location, "metadata", "layout.conf"), repo_name), level=logging.ERROR, noiselevel=-1)
-			return None
-		return repo_name
-
-	repo_name_file_location = os.path.join(repo_location, REPO_NAME_LOC)
-	try:
-		with io.open(_unicode_encode(repo_name_file_location, encoding=_encodings["fs"], errors="strict"),
-			mode="r", encoding=_encodings["repo.content"], errors="replace") as f:
-			repo_name = f.read()
-	except EnvironmentError:
-		repo_name = None
-	if repo_name is not None:
-		if repo_name.endswith("\n"):
-			repo_name = repo_name[:-1]
-		if _repo_name_re.match(repo_name) is None:
-			if not quiet:
-				writemsg_level("!!! %s\n" % _("Repository name set in %r is invalid: %r") %
-					(repo_name_file_location, repo_name), level=logging.ERROR, noiselevel=-1)
-			return None
-		return repo_name
-
-	return None
-
 def _gen_valid_repo(name):
 	"""
 	Substitute hyphen in place of characters that don't conform to PMS 3.1.5,
@@ -117,13 +86,13 @@ class RepoConfig(object):
 		'auto_sync', 'cache_formats', 'create_manifest', 'disable_manifest',
 		'eapi', 'eclass_db', 'eclass_locations', 'eclass_overrides',
 		'find_invalid_path_char', 'force', 'format', 'local_config', 'location',
-		'main_repo', 'manifest_hashes', 'masters', 'module_specific_options',
+		'main_repo', 'manifest_hashes', 'masters', 'missing_repo_name',
 		'name', 'portage1_profiles', 'portage1_profiles_compat', 'priority',
 		'profile_formats', 'sign_commit', 'sign_manifest',
 		'sync_depth', 'sync_hooks_only_on_change',
 		'sync_type', 'sync_umask', 'sync_uri', 'sync_user', 'thin_manifest',
 		'update_changelog', '_eapis_banned', '_eapis_deprecated',
-		'_invalid_config', '_masters_orig'
+		'_masters_orig', 'module_specific_options',
 		)
 
 	def __init__(self, name, repo_opts, local_config=True):
@@ -131,57 +100,6 @@ class RepoConfig(object):
 		   Try to read repo_name in repository location, but if
 		   it is not found use variable name as repository name"""
 
-		self._invalid_config = False
-
-		if name == "DEFAULT":
-			self.location = None
-			self.name = name
-		else:
-			location = repo_opts.get("location")
-			if location is None:
-				writemsg_level("!!! %s\n" % _("Section %r in repos.conf is missing 'location' attribute") %
-					name, level=logging.ERROR, noiselevel=-1)
-				self._invalid_config = True
-			else:
-				if not os.path.isabs(location):
-					writemsg_level("!!! %s\n" % _("Section %r in repos.conf has 'location' attribute set to "
-						"relative path: %r") % (name, location), level=logging.ERROR, noiselevel=-1)
-					self._invalid_config = True
-					location = None
-				elif not os.path.lexists(location):
-					if not portage._sync_mode:
-						writemsg_level("!!! %s\n" % _("Section %r in repos.conf has 'location' attribute set to "
-							"nonexistent directory: %r") % (name, location), level=logging.ERROR, noiselevel=-1)
-						self._invalid_config = True
-						location = None
-				elif not os.path.isdir(location):
-					writemsg_level("!!! %s\n" % _("Section %r in repos.conf has 'location' attribute set to "
-						"non-directory: %r") % (name, location), level=logging.ERROR, noiselevel=-1)
-					self._invalid_config = True
-					location = None
-				elif not os.access(location, os.R_OK):
-					writemsg_level("!!! %s\n" % _("Section %r in repos.conf has 'location' attribute set to "
-						"nonreadable directory: %r") % (name, location), level=logging.ERROR, noiselevel=-1)
-					self._invalid_config = True
-					location = None
-				else:
-					location = os.path.realpath(location)
-			self.location = location
-
-			if self.location is None or portage._sync_mode:
-				self.name = name
-			else:
-				self.name = _read_repo_name(location)
-				if self.name is None:
-					writemsg_level("!!! %s\n" % _("Section %r in repos.conf refers to repository without repository name "
-						"set in %r or in 'repo-name' attribute in %r") % (name, os.path.join(location, REPO_NAME_LOC),
-						os.path.join(location, "metadata", "layout.conf")), level=logging.ERROR, noiselevel=-1)
-					self._invalid_config = True
-				elif name != self.name:
-					writemsg_level("!!! %s\n" % _("Section %r in repos.conf has name different from repository name %r "
-						"set inside repository") % (name, self.name), level=logging.ERROR, noiselevel=-1)
-					self._invalid_config = True
-
 		force = repo_opts.get('force')
 		if force is not None:
 			force = tuple(force.split())
@@ -270,7 +188,32 @@ class RepoConfig(object):
 			format = format.strip()
 		self.format = format
 
+		location = repo_opts.get('location')
+		if location is not None and location.strip():
+			if os.path.isdir(location) or portage._sync_mode:
+				location = os.path.realpath(location)
+		else:
+			location = None
+		self.location = location
+
+		missing = True
+		self.name = name
+		if self.location is not None:
+			self.name, missing = self._read_valid_repo_name(self.location)
+			if missing:
+				# The name from repos.conf has to be used here for
+				# things like emerge-webrsync to work when the repo
+				# is empty (bug #484950).
+				if name is not None:
+					self.name = name
+				if portage._sync_mode:
+					missing = False
+
+		elif name == "DEFAULT":
+			missing = False
+
 		self.eapi = None
+		self.missing_repo_name = missing
 		# sign_commit is disabled by default, since it requires Git >=1.7.9,
 		# and key_id configured by `git config user.signingkey key_id`
 		self.sign_commit = False
@@ -306,6 +249,13 @@ class RepoConfig(object):
 				# them the ability to do incremental overrides
 				self.aliases = layout_data['aliases'] + tuple(aliases)
 
+			if layout_data['repo-name']:
+				# allow layout.conf to override repository name
+				# useful when having two copies of the same repo enabled
+				# to avoid modifying profiles/repo_name in one of them
+				self.name = layout_data['repo-name']
+				self.missing_repo_name = False
+
 			for value in ('allow-missing-manifest',
 				'allow-provide-virtual', 'cache-formats',
 				'create-manifest', 'disable-manifest', 'manifest-hashes',
@@ -393,11 +343,15 @@ class RepoConfig(object):
 		"""Update repository with options in another RepoConfig"""
 
 		keys = set(self.__slots__)
+		keys.discard("missing_repo_name")
 		for k in keys:
 			v = getattr(new_repo, k, None)
 			if v is not None:
 				setattr(self, k, v)
 
+		if new_repo.name is not None:
+			self.missing_repo_name = new_repo.missing_repo_name
+
 	@property
 	def writable(self):
 		"""
@@ -409,6 +363,42 @@ class RepoConfig(object):
 		"""
 		return os.access(first_existing(self.location), os.W_OK)
 
+	@staticmethod
+	def _read_valid_repo_name(repo_path):
+		name, missing = RepoConfig._read_repo_name(repo_path)
+		# We must ensure that the name conforms to PMS 3.1.5
+		# in order to avoid InvalidAtom exceptions when we
+		# use it to generate atoms.
+		name = _gen_valid_repo(name)
+		if not name:
+			# name only contains invalid characters
+			name = "x-" + os.path.basename(repo_path)
+			name = _gen_valid_repo(name)
+			# If basename only contains whitespace then the
+			# end result is name = 'x-'.
+		return name, missing
+
+	@staticmethod
+	def _read_repo_name(repo_path):
+		"""
+		Read repo_name from repo_path.
+		Returns repo_name, missing.
+		"""
+		repo_name_path = os.path.join(repo_path, REPO_NAME_LOC)
+		f = None
+		try:
+			f = io.open(
+				_unicode_encode(repo_name_path,
+				encoding=_encodings['fs'], errors='strict'),
+				mode='r', encoding=_encodings['repo.content'],
+				errors='replace')
+			return f.readline().strip(), False
+		except EnvironmentError:
+			return "x-" + os.path.basename(repo_path), True
+		finally:
+			if f is not None:
+				f.close()
+
 	def info_string(self):
 		"""
 		Returns a formatted string containing informations about the repository.
@@ -616,11 +606,6 @@ class RepoConfigLoader(object):
 			parser.remove_section(deleted_repo)
 
 		for sname in parser.sections():
-			if _repo_name_re.match(sname) is None:
-				writemsg_level("!!! %s\n" % _("Section %r in repos.conf has invalid name") %
-					sname, level=logging.ERROR, noiselevel=-1)
-				continue
-
 			optdict = {}
 			for oname in parser.options(sname):
 				optdict[oname] = parser.get(sname, oname)
@@ -639,8 +624,10 @@ class RepoConfigLoader(object):
 			# Perform repos.conf sync variable validation
 			portage.sync.validate_config(repo, logging)
 
-			if not repo._invalid_config:
-				prepos[sname] = repo
+			# For backward compatibility with locations set via PORTDIR and
+			# PORTDIR_OVERLAY, delay validation of the location and repo.name
+			# until after PORTDIR and PORTDIR_OVERLAY have been processed.
+			prepos[sname] = repo
 
 	def __init__(self, paths, settings):
 		"""Load config from files in paths"""
@@ -705,10 +692,50 @@ class RepoConfigLoader(object):
 		ignored_repos = tuple((repo_name, tuple(paths)) \
 			for repo_name, paths in ignored_map.items())
 
+		self.missing_repo_names = frozenset(repo.location
+			for repo in prepos.values()
+			if repo.location is not None and repo.missing_repo_name)
+
 		# Do this before expanding aliases, so that location_map and
 		# treemap consistently map unaliased names whenever available.
 		for repo_name, repo in list(prepos.items()):
-			if repo_name != "DEFAULT":
+			if repo.location is None:
+				if repo_name != 'DEFAULT':
+					# Skip this warning for repoman (bug #474578).
+					if settings.local_config and paths:
+						writemsg_level("!!! %s\n" % _("Section '%s' in repos.conf is missing location attribute") %
+							repo.name, level=logging.ERROR, noiselevel=-1)
+					del prepos[repo_name]
+					continue
+			else:
+				if not portage._sync_mode:
+					if not isdir_raise_eaccess(repo.location):
+						writemsg_level("!!! %s\n" % _("Section '%s' in repos.conf has location attribute set "
+							"to nonexistent directory: '%s'") %
+							(repo_name, repo.location), level=logging.ERROR, noiselevel=-1)
+
+						# Ignore missing directory for 'gentoo' so that
+						# first sync with emerge-webrsync is possible.
+						if repo.name != 'gentoo':
+							del prepos[repo_name]
+							continue
+
+					# After removing support for PORTDIR_OVERLAY, the following check can be:
+					# if repo.missing_repo_name:
+					if repo.missing_repo_name and repo.name != repo_name:
+						writemsg_level("!!! %s\n" % _("Section '%s' in repos.conf refers to repository "
+							"without repository name set in '%s'") %
+							(repo_name, os.path.join(repo.location, REPO_NAME_LOC)), level=logging.ERROR, noiselevel=-1)
+						del prepos[repo_name]
+						continue
+
+					if repo.name != repo_name:
+						writemsg_level("!!! %s\n" % _("Section '%s' in repos.conf has name different "
+							"from repository name '%s' set inside repository") %
+							(repo_name, repo.name), level=logging.ERROR, noiselevel=-1)
+						del prepos[repo_name]
+						continue
+
 				location_map[repo.location] = repo_name
 				treemap[repo_name] = repo.location
 
@@ -997,20 +1024,18 @@ def load_repository_config(settings, extra_files=None):
 def _get_repo_name(repo_location, cached=None):
 	if cached is not None:
 		return cached
-	return _read_repo_name(repo_location, quiet=True)
+	name, missing = RepoConfig._read_repo_name(repo_location)
+	if missing:
+		return None
+	return name
+
+def parse_layout_conf(repo_location, repo_name=None):
+	eapi = read_corresponding_eapi_file(os.path.join(repo_location, REPO_NAME_LOC))
 
-def _read_layout_conf(repo_location):
 	layout_filename = os.path.join(repo_location, "metadata", "layout.conf")
 	layout_file = KeyValuePairFileLoader(layout_filename, None, None)
 	layout_data, layout_errors = layout_file.load()
 
-	return layout_data, layout_errors
-
-def parse_layout_conf(repo_location, repo_name=None):
-	layout_data, layout_errors = _read_layout_conf(repo_location)
-
-	eapi = read_corresponding_eapi_file(os.path.join(repo_location, REPO_NAME_LOC))
-
 	data = {}
 
 	# None indicates abscence of a masters setting, which later code uses
@@ -1039,6 +1064,8 @@ def parse_layout_conf(repo_location, repo_name=None):
 	data['thin-manifest'] = layout_data.get('thin-manifests', 'false').lower() \
 		== 'true'
 
+	data['repo-name'] = _gen_valid_repo(layout_data.get('repo-name', ''))
+
 	manifest_policy = layout_data.get('use-manifests', 'strict').lower()
 	data['allow-missing-manifest'] = manifest_policy != 'strict'
 	data['create-manifest'] = manifest_policy != 'false'

diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py
index e7b8463..9a62e05 100644
--- a/pym/repoman/repos.py
+++ b/pym/repoman/repos.py
@@ -130,7 +130,11 @@ class RepoSettings(object):
 
 	def _add_repo(self, config_root, portdir_overlay):
 		self.repo_conf = portage.repository.config
-		self.repo_name = self.repo_conf._read_repo_name(portdir_overlay, quiet=True)
+		self.repo_name = self.repo_conf.RepoConfig._read_valid_repo_name(
+			portdir_overlay)[0]
+		self.layout_conf_data = self.repo_conf.parse_layout_conf(portdir_overlay)[0]
+		if self.layout_conf_data['repo-name']:
+			self.repo_name = self.layout_conf_data['repo-name']
 		tmp_conf_file = io.StringIO(textwrap.dedent("""
 			[%s]
 			location = %s