[gentoo-commits] eselect r783 - in trunk: . libs

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2010-11-26 16:42:23 +0000 (Fri, 26 Nov 2010)
New Revision: 783

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/libs/package-manager.bash.in
Log:
Use cave rather than paludis, fixes bug 346837.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-11-21 13:05:21 UTC (rev 782)
+++ trunk/ChangeLog	2010-11-26 16:42:23 UTC (rev 783)
@@ -1,3 +1,10 @@
[phone]  Ulrich Mueller  <ulm@g.o>
+
+	* libs/package-manager.bash.in (package_manager, run_paludis)
+	(envvar, best_version, has_version, get_repositories)
+	(get_repo_news_dir): Use cave rather than paludis. Patch from
+	Ciaran McCreesh <ciaran.mccreesh@××××××××××.com> in bug 346837.
+
 2010-11-21  Ulrich Mueller  <ulm@g.o>
 
 	* configure.ac: Update version to 1.2.12.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2010-11-21 13:05:21 UTC (rev 782)
+++ trunk/NEWS	2010-11-26 16:42:23 UTC (rev 783)
@@ -1,6 +1,10 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+trunk:
+    Bug fixes:
+    - Fixed bug #346837: Use cave rather than paludis.
+
 1.2.12:
     New features:
     - The news module now sorts the items by their date (bug #344655).

Modified: trunk/libs/package-manager.bash.in
===================================================================
--- trunk/libs/package-manager.bash.in	2010-11-21 13:05:21 UTC (rev 782)
+++ trunk/libs/package-manager.bash.in	2010-11-26 16:42:23 UTC (rev 783)
@@ -23,8 +23,7 @@
 		portage)
 			pm=portage ;;
 		paludis)
-			set -- ${PALUDIS_COMMAND:-paludis}
-			type "$1" &>/dev/null && pm=paludis ;;
+			pm=paludis ;;
 	esac
 	echo "${pm:-portage}"
 }
@@ -36,9 +35,9 @@
 }
 
 # run_paludis PRIVATE
-# Run PALUDIS_COMMAND (defaults to "paludis"). Redirect stderr
+# Run CAVE (defaults to "cave"). Redirect stderr
 run_paludis() {
-	${PALUDIS_COMMAND:-paludis} "$@" 2>/dev/null
+	${CAVE:-cave} "$@" 2>/dev/null
 }
 
 # arch
@@ -98,7 +97,8 @@
 	case $(package_manager) in
 		# portage does not support per-package envvar lookup
 		portage) portageq envvar "$2" ;;
-		paludis) run_paludis --environment-variable "$1" "$2" ;;
+		paludis) run_paludis print-id-environment-variable --best \
+			--variable-name "$2" --format '%v\n' "$1" ;;
 	esac
 }
 
@@ -108,7 +108,7 @@
 	[[ $# -eq 1 ]] || die "best_version expects exactly one argument"
 	case $(package_manager) in
 		portage) portageq best_version "${ROOT:-/}" "$1" ;;
-		paludis) run_paludis --best-version "$1" ;;
+		paludis) run_paludis print-best-version --format name-version "$1" ;;
 	esac
 }
 
@@ -118,7 +118,7 @@
 	[[ $# -eq 1 ]] || die "has_version expects exactly one argument"
 	case $(package_manager) in
 		portage) portageq has_version "${ROOT:-/}" "$1" ;;
-		paludis) run_paludis --has-version "$1" ;;
+		paludis) run_paludis has-version "$1" ;;
 	esac
 }
 
@@ -127,7 +127,7 @@
 get_repositories() {
 	case $(package_manager) in
 		portage) portageq get_repos "${ROOT:-/}" ;;
-		paludis) run_paludis --list-repositories | cut -d' ' -f 2 ;;
+		paludis) run_paludis print-repositories ;;
 	esac
 }
 
@@ -140,7 +140,8 @@
 		portage)
 			echo "$(portageq get_repo_path \
 				"${ROOT:-/}" "${repo}")/metadata/news" ;;
-		paludis) run_paludis --configuration-variable ${repo} newsdir ;;
+		paludis) run_paludis print-repository-metadata ${repo} \
+			--raw-name newsdir --format '%v\n' ;;
 	esac
 }