diff options
author | Ulrich Müller <ulm@gentoo.org> | 2012-02-12 08:17:27 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2012-02-12 08:17:27 +0000 |
commit | e33c844a23fa323abe341e861af5f9dfd52b6607 (patch) | |
tree | cd113952ae761ad93011eac2700b50291a869a37 | |
parent | Scan filesystem for available libdirs, bug 401843. (diff) | |
download | eselect-e33c844a23fa323abe341e861af5f9dfd52b6607.tar.gz eselect-e33c844a23fa323abe341e861af5f9dfd52b6607.tar.bz2 eselect-e33c844a23fa323abe341e861af5f9dfd52b6607.zip |
Fix regular expression for overlays in profile module, bug 403215.
svn path=/trunk/; revision=865
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | modules/profile.eselect | 2 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2012-02-12 Ulrich Müller <ulm@gentoo.org> + + * modules/profile.eselect (get_repos): Fix regular expression + for overlays, bug 403215. Thanks to Sergei Trofimovich + <slyfox@gentoo.org>. + 2012-02-02 Ulrich Müller <ulm@gentoo.org> * libs/multilib.bash.in (ES_VALID_MULTILIB_DIRS): Add libx32. @@ -1,6 +1,9 @@ This file contains a summary of changes in released versions. Please read the ChangeLog file for a more detailed listing of changes/bug fixes. + Bug fixes: + - Fixed bug #403215: Regular expression for overlays in profile module. + 1.3: New features: - The profile module supports profiles in overlays (bug #265264). diff --git a/modules/profile.eselect b/modules/profile.eselect index e381474..3b4f930 100644 --- a/modules/profile.eselect +++ b/modules/profile.eselect @@ -33,7 +33,7 @@ get_symlink_location() { get_repos() { # sort: DEFAULT_REPO first, then alphabetical order portageq get_repos "${ROOT:-/}" \ - | sed "s/[[:space:]]\+/\n/g;s/\b${DEFAULT_REPO}\b/ &/" \ + | sed "s/[[:space:]]\+/\n/g;s/^${DEFAULT_REPO}\$/ &/gm" \ | LC_ALL=C sort [[ -z ${PIPESTATUS[@]#0} ]] } |