summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller2012-10-11 19:53:49 (GMT)
committerUlrich Müller2012-10-11 19:53:49 (GMT)
commit1be0f713e5b1412f021198b283b30aa7592dfc22 (patch)
tree2053da08bdd1023761486d76478146cd19466710
parent08806f2a29db0d9c182ab5b54a6943b3ebb65f0d (diff)
Recognise profiles whose names contain a hyphen, bug 437986.
* libs/package-manager.bash.in (arch): Add amd64 as case label. * modules/profile.eselect (set_symlink): Include underscore and hyphen in regexp, because both are allowed in keyword names, bug 437986. Thanks to Yuta Satoh <nigoro.gentoo@0x100.com>.
-rw-r--r--ChangeLog7
-rw-r--r--libs/package-manager.bash.in2
-rw-r--r--modules/profile.eselect2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eadc072..857a31f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-11 Ulrich Müller <ulm@gentoo.org>
+
+ * libs/package-manager.bash.in (arch): Add amd64 as case label.
+ * modules/profile.eselect (set_symlink): Include underscore and
+ hyphen in regexp, because both are allowed in keyword names,
+ bug 437986. Thanks to Yuta Satoh <nigoro.gentoo@0x100.com>.
+
2012-09-15 Ulrich Müller <ulm@gentoo.org>
* libs/editor-variable.bash.in (do_set):
diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in
index 55a48a6..d1ce36e 100644
--- a/libs/package-manager.bash.in
+++ b/libs/package-manager.bash.in
@@ -55,7 +55,7 @@ arch() {
ret=$(uname -m)
case ${ret} in
- alpha|ia64|m68k|ppc|ppc64) ;;
+ alpha|amd64|ia64|m68k|ppc|ppc64) ;;
arm*) ret=arm ;;
i?86) ret=x86 ;;
mips*) ret=mips ;;
diff --git a/modules/profile.eselect b/modules/profile.eselect
index 5adccd1..6db3dd5 100644
--- a/modules/profile.eselect
+++ b/modules/profile.eselect
@@ -95,7 +95,7 @@ set_symlink() {
repopath=$(get_repo_path "${repo}") || die -q "get_repo_path failed"
# do a reverse lookup and find the arch associated with ${target}
parch=$(sed -n -e \
- "s|^\([[:alnum:]]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
+ "s|^\([[:alnum:]_-]\+\)[[:space:]].*${target}[[:space:]].*$|\1|p" \
"${repopath}/profiles/profiles.desc")
[[ ${arch} != "${parch}" && -z ${force} ]] \
&& die -q "${target} is not a valid profile for ${arch}"