| 1 |
Author: ulm |
| 2 |
Date: 2011-06-29 18:11:05 +0000 (Wed, 29 Jun 2011) |
| 3 |
New Revision: 815 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/NEWS |
| 8 |
trunk/libs/package-manager.bash.in |
| 9 |
Log: |
| 10 |
Add pkgcore support, bug 304011. |
| 11 |
|
| 12 |
Modified: trunk/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- trunk/ChangeLog 2011-05-02 18:30:43 UTC (rev 814) |
| 15 |
+++ trunk/ChangeLog 2011-06-29 18:11:05 UTC (rev 815) |
| 16 |
@@ -1,3 +1,9 @@ |
| 17 |
+2011-06-25 Brian Harring <ferringb@g.o> |
| 18 |
+ |
| 19 |
+ * libs/package-manager.bash.in (package_manager, envvar) |
| 20 |
+ (best_version, has_version, get_repositories, get_repo_news_dir) |
| 21 |
+ (env_update): Add pkgcore support, bug 304011. |
| 22 |
+ |
| 23 |
2011-05-02 Ulrich Mueller <ulm@g.o> |
| 24 |
|
| 25 |
* bin/Makefile.am (install-symlink-%): Make relative symlinks. |
| 26 |
|
| 27 |
Modified: trunk/NEWS |
| 28 |
=================================================================== |
| 29 |
--- trunk/NEWS 2011-05-02 18:30:43 UTC (rev 814) |
| 30 |
+++ trunk/NEWS 2011-06-29 18:11:05 UTC (rev 815) |
| 31 |
@@ -1,6 +1,9 @@ |
| 32 |
This file contains a summary of changes in released versions. Please read the |
| 33 |
ChangeLog file for a more detailed listing of changes/bug fixes. |
| 34 |
|
| 35 |
+ New features: |
| 36 |
+ - Support for pkgcore (bug #304011). |
| 37 |
+ |
| 38 |
1.2.15: |
| 39 |
Bug fixes: |
| 40 |
- Fixed bug #358185: ROOT handling in news module. |
| 41 |
|
| 42 |
Modified: trunk/libs/package-manager.bash.in |
| 43 |
=================================================================== |
| 44 |
--- trunk/libs/package-manager.bash.in 2011-05-02 18:30:43 UTC (rev 814) |
| 45 |
+++ trunk/libs/package-manager.bash.in 2011-06-29 18:11:05 UTC (rev 815) |
| 46 |
@@ -21,6 +21,7 @@ |
| 47 |
local pm |
| 48 |
case ${PACKAGE_MANAGER} in |
| 49 |
portage) pm=portage ;; |
| 50 |
+ pkgcore) pm=pkgcore ;; |
| 51 |
paludis) pm=paludis ;; |
| 52 |
esac |
| 53 |
echo "${pm:-portage}" |
| 54 |
@@ -95,6 +96,7 @@ |
| 55 |
case $(package_manager) in |
| 56 |
# portage does not support per-package envvar lookup |
| 57 |
portage) portageq envvar "$2" ;; |
| 58 |
+ pkgcore) pinspect portageq envvar "$2" ;; |
| 59 |
paludis) run_paludis print-id-environment-variable --best \ |
| 60 |
--variable-name "$2" --format '%v\n' "$1" ;; |
| 61 |
esac |
| 62 |
@@ -106,6 +108,7 @@ |
| 63 |
[[ $# -eq 1 ]] || die "best_version expects exactly one argument" |
| 64 |
case $(package_manager) in |
| 65 |
portage) portageq best_version "${ROOT:-/}" "$1" ;; |
| 66 |
+ pkgcore) pinspect portageq best_version "${ROOT:-/}" "$1" ;; |
| 67 |
paludis) run_paludis print-best-version --format name-version "$1" ;; |
| 68 |
esac |
| 69 |
} |
| 70 |
@@ -116,6 +119,7 @@ |
| 71 |
[[ $# -eq 1 ]] || die "has_version expects exactly one argument" |
| 72 |
case $(package_manager) in |
| 73 |
portage) portageq has_version "${ROOT:-/}" "$1" ;; |
| 74 |
+ pkgcore) pinspect portageq has_version "${ROOT:-/}" "$1" ;; |
| 75 |
paludis) run_paludis has-version "$1" ;; |
| 76 |
esac |
| 77 |
} |
| 78 |
@@ -125,6 +129,7 @@ |
| 79 |
get_repositories() { |
| 80 |
case $(package_manager) in |
| 81 |
portage) portageq get_repos "${ROOT:-/}" ;; |
| 82 |
+ pkgcore) pinspect portageq get_repositories ;; |
| 83 |
paludis) run_paludis print-repositories ;; |
| 84 |
esac |
| 85 |
} |
| 86 |
@@ -137,6 +142,7 @@ |
| 87 |
case $(package_manager) in |
| 88 |
portage) echo "$(portageq get_repo_path \ |
| 89 |
"${ROOT:-/}" "${repo}")/metadata/news" ;; |
| 90 |
+ pkgcore) pinspect portageq get_repo_news_path "${repo}" ;; |
| 91 |
paludis) run_paludis print-repository-metadata ${repo} \ |
| 92 |
--raw-name newsdir --format '%v\n' ;; |
| 93 |
esac |
| 94 |
@@ -146,12 +152,11 @@ |
| 95 |
# Run env-update command, if available with the package manager |
| 96 |
# If $1 is non-zero: also run ldconfig to update /etc/ld.so.cache |
| 97 |
env_update() { |
| 98 |
- local args |
| 99 |
+ local noldconfig |
| 100 |
+ [[ $1 -ne 0 ]] || noldconfig=y |
| 101 |
case $(package_manager) in |
| 102 |
- portage) |
| 103 |
- [[ $1 -eq 0 ]] && args="--no-ldconfig" |
| 104 |
- "@ENV_UPDATE@" ${args} |
| 105 |
- ;; |
| 106 |
+ portage) "@ENV_UPDATE@" ${noldconfig:+--no-ldconfig} ;; |
| 107 |
+ pkgcore) pmaint env-update ${noldconfig:+--skip-ldconfig} ;; |
| 108 |
paludis) return 127 ;; |
| 109 |
esac |
| 110 |
} |
Archives