Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] eselect r499 - trunk/libs
Date: Thu, 23 Apr 2009 20:01:29
Message-Id: E1Lx56t-0008Fq-NN@stork.gentoo.org
1 Author: ulm
2 Date: 2009-04-23 20:01:27 +0000 (Thu, 23 Apr 2009)
3 New Revision: 499
4
5 Modified:
6 trunk/libs/package-manager.bash.in
7 Log:
8 Test if portageq is executable, but don't run it.
9
10 Modified: trunk/libs/package-manager.bash.in
11 ===================================================================
12 --- trunk/libs/package-manager.bash.in 2009-04-23 10:05:30 UTC (rev 498)
13 +++ trunk/libs/package-manager.bash.in 2009-04-23 20:01:27 UTC (rev 499)
14 @@ -127,7 +127,7 @@
15 ;;
16 portage)
17 for i in $(portageq envvar PORTDIR PORTDIR_OVERLAY); do
18 - portage_get_repo_name $i
19 + portage_get_repo_name ${i}
20 done
21 ;;
22 *)
23 @@ -158,17 +158,19 @@
24 local manager
25
26 if [[ -n ${ESELECT_PACKAGE_MANAGER} ]] ; then
27 - echo ${ESELECT_PACKAGE_MANAGER}
28 + echo "${ESELECT_PACKAGE_MANAGER}"
29 return
30 fi
31
32 # Try Portage first, since it is Gentoo's official package manager
33 - if [[ -n $(portageq envvar PORTDIR) ]] ; then
34 + # TODO: Add an option to make it selectable by the user
35 + # TODO: Support Pkgcore
36 + if [[ -x @PORTAGEQ@ ]] ; then
37 manager="portage"
38 elif $(paludis_command) --list-repositories &>/dev/null ; then
39 manager="paludis"
40 else
41 - die "No package manager found"
42 + die "No package manager found"
43 fi
44
45 echo ${manager}