diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libs/package-manager.bash.in | 2 | ||||
| -rw-r--r-- | modules/profile.eselect | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -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}" |