1 |
Author: ulm |
2 |
Date: 2009-04-23 10:05:30 +0000 (Thu, 23 Apr 2009) |
3 |
New Revision: 498 |
4 |
|
5 |
Modified: |
6 |
trunk/ChangeLog |
7 |
trunk/libs/package-manager.bash.in |
8 |
Log: |
9 |
Rename ESELECT_PACKAGE_MANAGER_CACHE to ESELECT_PACKAGE_MANAGER and don't export it. Prefer Portage over Paludis. Other small changes. |
10 |
|
11 |
Modified: trunk/ChangeLog |
12 |
=================================================================== |
13 |
--- trunk/ChangeLog 2009-04-23 06:30:15 UTC (rev 497) |
14 |
+++ trunk/ChangeLog 2009-04-23 10:05:30 UTC (rev 498) |
15 |
@@ -1,5 +1,9 @@ |
16 |
2009-04-23 Ulrich Mueller <ulm@g.o> |
17 |
|
18 |
+ * libs/package-manager.bash.in (package-manager): |
19 |
+ Rename ESELECT_PACKAGE_MANAGER_CACHE to ESELECT_PACKAGE_MANAGER |
20 |
+ and don't export it. Prefer Portage over Paludis. |
21 |
+ |
22 |
* libs/output.bash.in (get_column_width): Default to a width of |
23 |
80 characters, not 79. |
24 |
|
25 |
|
26 |
Modified: trunk/libs/package-manager.bash.in |
27 |
=================================================================== |
28 |
--- trunk/libs/package-manager.bash.in 2009-04-23 06:30:15 UTC (rev 497) |
29 |
+++ trunk/libs/package-manager.bash.in 2009-04-23 10:05:30 UTC (rev 498) |
30 |
@@ -1,6 +1,6 @@ |
31 |
#!/bin/bash |
32 |
|
33 |
-# Copyright (c) 2005, 2007 Gentoo Foundation. |
34 |
+# Copyright (c) 2005-2009 Gentoo Foundation. |
35 |
# $Id$ |
36 |
# This file is part of the 'eselect' tools framework. |
37 |
# |
38 |
@@ -27,7 +27,7 @@ |
39 |
# we cannot get a list of valid profiles without it. |
40 |
if [[ -z ${ret} ]] ; then |
41 |
|
42 |
- if [[ -n "${ROOT}" && ${ROOT} != "/" ]] ; then |
43 |
+ if [[ -n ${ROOT} && ${ROOT} != "/" ]] ; then |
44 |
write_warning_msg "Failed to determine \${ARCH}. Is your make.profile symlink valid?" |
45 |
return 1 |
46 |
fi |
47 |
@@ -64,7 +64,7 @@ |
48 |
# best-version |
49 |
# Return true if package $2 is available in ${ROOT} |
50 |
best-version() { |
51 |
- [[ ${#@} -eq 1 ]] || die "has_version expects exactly 1 arguments!" |
52 |
+ [[ $# -eq 1 ]] || die "has_version expects exactly 1 arguments!" |
53 |
|
54 |
local manager=$(package-manager) |
55 |
case ${manager} in |
56 |
@@ -83,7 +83,7 @@ |
57 |
# Return the contents of environment variable $2 as seen by package manager(s) |
58 |
# for package $1. |
59 |
envvar() { |
60 |
- [[ ${#@} -eq 2 ]] || die "envvar expects exactly 2 arguments!" |
61 |
+ [[ $# -eq 2 ]] || die "envvar expects exactly 2 arguments!" |
62 |
|
63 |
local manager=$(package-manager) |
64 |
case ${manager} in |
65 |
@@ -102,7 +102,7 @@ |
66 |
# has-version |
67 |
# Return true if package $2 is available in ${ROOT} |
68 |
has-version() { |
69 |
- [[ ${#@} -eq 1 ]] || die "has_version expects exactly 1 arguments!" |
70 |
+ [[ $# -eq 1 ]] || die "has_version expects exactly 1 arguments!" |
71 |
|
72 |
local manager=$(package-manager) |
73 |
case ${manager} in |
74 |
@@ -136,7 +136,7 @@ |
75 |
} |
76 |
|
77 |
get_news_dir_name() { |
78 |
- [[ ${#@} -eq 1 ]] || die "get_news_dir_name expects exactly 1 argument!" |
79 |
+ [[ $# -eq 1 ]] || die "get_news_dir_name expects exactly 1 argument!" |
80 |
|
81 |
local name=${1%::*} repo=${1##*::} |
82 |
local manager=$(package-manager) |
83 |
@@ -157,20 +157,22 @@ |
84 |
package-manager() { |
85 |
local manager |
86 |
|
87 |
- if [[ -n ${ESELECT_PACKAGE_MANAGER_CACHE} ]] ; then |
88 |
- echo ${ESELECT_PACKAGE_MANAGER_CACHE} |
89 |
+ if [[ -n ${ESELECT_PACKAGE_MANAGER} ]] ; then |
90 |
+ echo ${ESELECT_PACKAGE_MANAGER} |
91 |
return |
92 |
fi |
93 |
|
94 |
- # We prefer paludis over portage |
95 |
- if $(paludis_command) --list-repositories > /dev/null 2>&1 ; then |
96 |
+ # Try Portage first, since it is Gentoo's official package manager |
97 |
+ if [[ -n $(portageq envvar PORTDIR) ]] ; then |
98 |
+ manager="portage" |
99 |
+ elif $(paludis_command) --list-repositories &>/dev/null ; then |
100 |
manager="paludis" |
101 |
else |
102 |
- manager="portage" |
103 |
+ die "No package manager found" |
104 |
fi |
105 |
|
106 |
echo ${manager} |
107 |
- export ESELECT_PACKAGE_MANAGER_CACHE=${manager} |
108 |
+ ESELECT_PACKAGE_MANAGER=${manager} |
109 |
} |
110 |
|
111 |
# vim: set sw=4 et sts=4 tw=80 : |