[gentoo-commits] eselect r832 - in trunk: . modules

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2011-09-01 20:21:33 +0000 (Thu, 01 Sep 2011)
New Revision: 832

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/modules/profile.eselect
Log:
Support profiles in overlays, bug 265264.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-08-28 19:40:21 UTC (rev 831)
+++ trunk/ChangeLog	2011-09-01 20:21:33 UTC (rev 832)
@@ -1,5 +1,10 @@
 2011-08-28  Ulrich Mueller  <ulm@g.o>
 
+	* modules/profile.eselect (find_targets, set_symlink, do_show)
+	(do_list): Support profiles in overlays, bug 265264. Thanks to
+	<mishanq@×××××.com> and <lashzcore@×××××.com> for sending patches.
+	(get_repos, get_repo_path): New functions.
+
 	* modules/bashcomp.eselect: Code cleaned up.
 	(find_targets): Simplified.
 	(do_enable): Don't search for completion files in current working

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2011-08-28 19:40:21 UTC (rev 831)
+++ trunk/NEWS	2011-09-01 20:21:33 UTC (rev 832)
@@ -5,6 +5,9 @@
     - Fixed bug #363481: Don't search for completion files in current working
       directory in bashcomp module.
 
+    New features:
+    - The profile module supports profiles in overlays (bug #265264).
+
 1.2.16:
     New features:
     - Support for pkgcore (bug #304011).

Modified: trunk/modules/profile.eselect
===================================================================
--- trunk/modules/profile.eselect	2011-08-28 19:40:21 UTC (rev 831)
+++ trunk/modules/profile.eselect	2011-09-01 20:21:33 UTC (rev 832)
@@ -1,6 +1,6 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# Copyright 2005-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
 # $Id$
 
 # This is a portage-only module.
@@ -11,6 +11,8 @@
 SVN_DATE='$Date$'
 VERSION=$(svn_date_to_version "${SVN_DATE}")
 
+DEFAULT_REPO="gentoo"
+
 # get location of make.profile symlink
 get_symlink_location() {
 	local oldloc=${EROOT%/}/etc/make.profile
@@ -27,18 +29,43 @@
 	fi
 }
 
+# get list of repositories
+get_repos() {
+	# sort: DEFAULT_REPO first, then alphabetical order
+	portageq get_repos "${ROOT:-/}" \
+		| sed "s/[[:space:]]\+/\n/g;s/\b${DEFAULT_REPO}\b/ &/" \
+		| LC_ALL=C sort
+	[[ -z ${PIPESTATUS[@]#0} ]]
+}
+
+# get paths for a given list of repositories
+get_repo_path() {
+	portageq get_repo_path "${ROOT:-/}" "$@"
+}
+
 # get a list of valid profiles
+# returns a line <repo>::<repo_path>::<profile> for every profile
 find_targets() {
-	local arch p portdir=$1
-	[[ -n ${portdir} ]] || portdir=$(portageq portdir)
+	local arch desc repos repo_paths i p
 
 	arch=$(arch)
-	[[ -z ${arch} ]] && return 1
+	[[ -z ${arch} ]] && die -q "Cannot determine architecture"
 
-	for p in $(sed -n -e "s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" \
-		"${ROOT}${portdir}/profiles/profiles.desc")
-	do
-		echo ${p}
+	repos=( $(get_repos) ) || die -q "get_repos failed"
+	repo_paths=( $(get_repo_path "${repos[@]}") ) \
+		|| die -q "get_repo_path failed"
+	[[ ${#repos[@]} -eq 0 || ${#repos[@]} -ne ${#repo_paths[@]} ]] \
+		&& die -q "Cannot get list of repositories"
+
+	for (( i = 0; i < ${#repos[@]}; i++ )); do
+		desc=${repo_paths[i]}/profiles/profiles.desc
+		[[ -r ${desc} ]] || continue
+		# parse profiles.desc and find profiles suitable for arch
+		for p in $(sed -n -e \
+			"s|^${arch}[[:space:]]\+\([^[:space:]]\+\).*$|\1|p" "${desc}")
+		do
+			echo "${repos[i]}::${repo_paths[i]}::${p}"
+		done
 	done
 }
 
@@ -49,51 +76,57 @@
 
 # set the make.profile symlink
 set_symlink() {
-	local portdir=$(portageq portdir) target=$1 force=$2 targets arch parch
+	local target=$1 force=$2 targets arch parch repo repopath
 
 	if is_number "${target}"; then
-		targets=( $(find_targets "${portdir}") )
-		[[ -z ${targets} ]] && die -q "Failed to get a list of valid profiles"
+		targets=( $(find_targets) )
+		[[ ${#targets[@]} -eq 0 ]] \
+			&& die -q "Failed to get a list of valid profiles"
 		target=${targets[target-1]}
-	elif [[ -n ${target} && -d ${ROOT}${portdir}/profiles/${target} ]]
-	then
+		repo=${target%%::*}; target=${target#*::}
+		repopath=${target%%::*}; target=${target#*::}
+	elif [[ -n ${target} ]]; then
 		# if the profile was explicitly specified (rather than a number)
 		# double check and make sure it's valid
 		arch=$(arch)
-		[[ -z ${arch} && -z ${force} ]] && return 1
-
+		[[ -z ${arch} && -z ${force} ]] \
+			&& die -q "Cannot determine architecture"
+		repo=${target%%:*}
+		# assume default repo if not explicitly specified
+		[[ ${repo} == "${target}" || -z ${repo} ]] && repo=${DEFAULT_REPO}
+		target=${target#*:}
+		repopath=$(get_repo_path "${repo}") || die -q "get_repo_path failed"
 		# do a reverse lookup and find the arch associated with ${target}
 		parch=$(sed -n -e \
 			"s|^\([[:alnum:]]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
-			"${ROOT}${portdir}/profiles/profiles.desc")
+			"${repopath}/profiles/profiles.desc")
+		[[ ${arch} != "${parch}" && -z ${force} ]] \
+			&& die -q "${target} is not a valid profile for ${arch}"
+	fi
 
-		if [[ ${arch} != ${parch} && -z ${force} ]]; then
-			die -q "${target} is not a valid profile for ${arch}"
-		fi
+	[[ -z ${target} || -z ${repopath} ]] \
+		&& die -q "Target \"$1\" doesn't appear to be valid!"
+	[[ ! -d ${repopath}/profiles/${target} ]] \
+		&& die -q "No profile directory for target \"${target}\""
+
+	# we must call remove_symlink() here instead of calling it from
+	# do_set(), since if the link is removed, we cannot reliably
+	# determine ${arch} in find_targets()
+	if [[ -L ${MAKE_PROFILE} ]]; then
+		remove_symlink \
+			|| die -q "Couldn't remove current ${MAKE_PROFILE} symlink"
 	fi
 
-	if [[ -z ${target} ]]; then
-		die -q "Target \"$1\" doesn't appear to be valid!"
-	elif [[ -d ${ROOT}${portdir}/profiles/${target} ]]; then
-		# we must call remove_symlink() here instead of calling
-		# it from do_set(), since if the link is removed, we
-		# cannot determine $ARCH in find_targets()
-		if [[ -L ${MAKE_PROFILE} ]]; then
-			remove_symlink \
-				|| die -q "Couldn't remove current ${MAKE_PROFILE} symlink"
-		fi
-		ln -s "$(relative_name \
-			"${ROOT}${portdir}" "${MAKE_PROFILE%/*}")/profiles/${target}" \
-			"${MAKE_PROFILE}"
-		# check if the resulting symlink is sane
-		if [[ $(canonicalise "${MAKE_PROFILE}") \
-			!= "$(canonicalise "${EROOT}")"/* ]]; then
-			write_warning_msg \
-				"Strange path. Check ${MAKE_PROFILE} symlink"
-		fi
-	else
-		die -q "Target \"$1\" doesn't appear to be valid!"
-	fi
+	# set relative symlink
+	ln -s "$(relative_name \
+		"${repopath}" "${MAKE_PROFILE%/*}")/profiles/${target}" \
+		"${MAKE_PROFILE}" \
+		|| die -q "Couldn't set new ${MAKE_PROFILE} symlink"
+	# check if the resulting symlink is sane
+	[[ $(canonicalise "${MAKE_PROFILE}") != "$(canonicalise "${EROOT}")"/* ]] \
+		&& write_warning_msg "Strange path. Check ${MAKE_PROFILE} symlink"
+
+	return 0
 }
 
 ### show action ###
@@ -103,13 +136,30 @@
 }
 
 do_show() {
+	local link repos repo_paths dir i
+
 	get_symlink_location
 	write_list_start "Current ${MAKE_PROFILE} symlink:"
 	if [[ -L ${MAKE_PROFILE} ]]; then
-		local link=$(canonicalise "${MAKE_PROFILE}")
-		local portdir=$(portageq portdir)
-		local profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
-		link=${link##${profiledir}/}
+		link=$(canonicalise "${MAKE_PROFILE}")
+		repos=( $(get_repos) ) || die -q "get_repos failed"
+		repo_paths=( $(get_repo_path "${repos[@]}") ) \
+			|| die -q "get_repo_path failed"
+		[[ ${#repos[@]} -eq 0 || ${#repos[@]} -ne ${#repo_paths[@]} ]] \
+			&& die -q "Cannot get list of repositories"
+
+		# Unfortunately, it's not obvious where to split a given path
+		# in repository directory and profile. So loop over all
+		# repositories and compare the canonicalised paths.
+		for (( i = 0; i < ${#repos[@]}; i++ )); do
+			dir=$(canonicalise "${repo_paths[i]}/profiles")
+			if [[ ${link} == "${dir}"/* ]]; then
+				link=${link##"${dir}/"}
+				[[ ${repos[i]} != "${DEFAULT_REPO}" ]] \
+					&& link=${repos[i]}:${link}
+				break
+			fi
+		done
 		write_kv_list_entry "${link}" ""
 	else
 		write_kv_list_entry "(unset)" ""
@@ -123,23 +173,27 @@
 }
 
 do_list() {
-	local portdir profiledir active targets
+	local targets active i target repo repopath
+
 	targets=( $(find_targets) )
+	[[ ${#targets[@]} -eq 0 ]] \
+		&& die -q "Failed to get a list of valid profiles"
 
-	[[ -z ${targets} ]] && die -q "Failed to get a list of valid profiles"
-
 	get_symlink_location
-	portdir=$(portageq portdir)
-	profiledir=$(canonicalise "${ROOT}${portdir}/profiles")
 	active=$(canonicalise "${MAKE_PROFILE}")
-	active=${active##${profiledir}/}
-	if [[ -n ${targets[@]} ]]; then
-		local i
-		for (( i = 0; i < ${#targets[@]}; i++ )); do
-			[[ ${targets[i]} == ${active} ]] \
-				&& targets[i]=$(highlight_marker "${targets[i]}")
-		done
-	fi
+
+	for (( i = 0; i < ${#targets[@]}; i++ )); do
+		target=${targets[i]}
+		repo=${target%%::*}; target=${target#*::}
+		repopath=${target%%::*}; target=${target#*::}
+		if [[ ${repo} == "${DEFAULT_REPO}" ]]; then
+			targets[i]=${target}
+		else
+			targets[i]=${repo}:${target}
+		fi
+		[[ $(canonicalise "${repopath}/profiles/${target}") == "${active}" ]] \
+			&& targets[i]=$(highlight_marker "${targets[i]}")
+	done
 	write_list_start "Available profile symlink targets:"
 	write_numbered_list "${targets[@]}"
 }