| 1 |
Author: ulm |
| 2 |
Date: 2009-04-29 17:00:34 +0000 (Wed, 29 Apr 2009) |
| 3 |
New Revision: 519 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/libs/package-manager.bash.in |
| 7 |
Log: |
| 8 |
Wrapper functions already redirect stderr, no need to do it here again. |
| 9 |
|
| 10 |
Modified: trunk/libs/package-manager.bash.in |
| 11 |
=================================================================== |
| 12 |
--- trunk/libs/package-manager.bash.in 2009-04-29 16:44:47 UTC (rev 518) |
| 13 |
+++ trunk/libs/package-manager.bash.in 2009-04-29 17:00:34 UTC (rev 519) |
| 14 |
@@ -69,15 +69,10 @@ |
| 15 |
|
| 16 |
local manager=$(package-manager) |
| 17 |
case ${manager} in |
| 18 |
- paludis) |
| 19 |
- paludis_envvar $* 2>/dev/null |
| 20 |
- ;; |
| 21 |
- portage) |
| 22 |
- # portage does not support per-package envvar lookup. |
| 23 |
- portageq envvar "${2}" 2>/dev/null |
| 24 |
- ;; |
| 25 |
- *) |
| 26 |
- die "Unknown package manager: \"${manager}\"" |
| 27 |
+ paludis) paludis_envvar "$1" "$2" ;; |
| 28 |
+ # portage does not support per-package envvar lookup |
| 29 |
+ portage) portageq envvar "$2" ;; |
| 30 |
+ *) die "Unknown package manager: \"${manager}\"" ;; |
| 31 |
esac |
| 32 |
} |
| 33 |
|
| 34 |
@@ -88,8 +83,8 @@ |
| 35 |
|
| 36 |
local manager=$(package-manager) |
| 37 |
case ${manager} in |
| 38 |
- paludis) paludis_best-version "${1}" 2>/dev/null ;; |
| 39 |
- portage) portageq best_version "${ROOT:-/}" "${1}" 2>/dev/null ;; |
| 40 |
+ paludis) paludis_best-version "$1" ;; |
| 41 |
+ portage) portageq best_version "${ROOT:-/}" "$1" ;; |
| 42 |
*) die "Unknown package manager: \"${manager}\"" ;; |
| 43 |
esac |
| 44 |
} |
| 45 |
@@ -101,8 +96,8 @@ |
| 46 |
|
| 47 |
local manager=$(package-manager) |
| 48 |
case ${manager} in |
| 49 |
- paludis) paludis_has-version "${1}" 2>/dev/null ;; |
| 50 |
- portage) portageq has_version "${ROOT:-/}" "${1}" 2>/dev/null ;; |
| 51 |
+ paludis) paludis_has-version "$1" ;; |
| 52 |
+ portage) portageq has_version "${ROOT:-/}" "$1" ;; |
| 53 |
*) die "Unknown package manager: \"${manager}\"" ;; |
| 54 |
esac |
| 55 |
} |
| 56 |
@@ -112,15 +107,9 @@ |
| 57 |
get_repositories() { |
| 58 |
local manager=$(package-manager) |
| 59 |
case ${manager} in |
| 60 |
- paludis) |
| 61 |
- $(paludis_command) --list-repositories | cut -d' ' -f 2 |
| 62 |
- ;; |
| 63 |
- portage) |
| 64 |
- portageq get_repos "${ROOT:-/}" |
| 65 |
- ;; |
| 66 |
- *) |
| 67 |
- die "Unknown package manager: \"${manager}\"" |
| 68 |
- ;; |
| 69 |
+ paludis) $(paludis_command) --list-repositories | cut -d' ' -f 2 ;; |
| 70 |
+ portage) portageq get_repos "${ROOT:-/}" ;; |
| 71 |
+ *) die "Unknown package manager: \"${manager}\"" ;; |
| 72 |
esac |
| 73 |
} |
Archives