diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2010-06-28 05:43:31 +0200 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2010-06-28 15:39:17 +0300 |
| commit | 96c355e3f7fc8c6da643676337363e32056c0c4c (patch) | |
| tree | 6776f78e50b55cc9de6ca5905db5b2e6d4cc329a | |
| parent | 05fcf3c7c969964af7aae181d1f409ad7f5a6164 (diff) | |
| download | kde-96c355e3f7fc8c6da643676337363e32056c0c4c.tar.gz kde-96c355e3f7fc8c6da643676337363e32056c0c4c.tar.bz2 kde-96c355e3f7fc8c6da643676337363e32056c0c4c.zip | |
[Documentation/maintainers/bump_new_revision.sh] Teach it not to add keywords to live ebuilds
| -rwxr-xr-x | Documentation/maintainers/bump_new_revision.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh index f9fb50b8350..42fb1938d9d 100755 --- a/Documentation/maintainers/bump_new_revision.sh +++ b/Documentation/maintainers/bump_new_revision.sh @@ -124,17 +124,19 @@ sync_main_keywords_with_overlay() { if [[ -d "${dir}" ]] ; then pushd "${dir}" &> /dev/null # the grep is for removing 3.5 ebuilds from knowledge - if [[ ${3} = intree ]]; then + if [[ ${3} = intree ]]; then KEYWORDS="$(find ./ -name \*ebuild |grep -v "\-3.5" | sort | tail -n 2 | head -n 1 | xargs -i grep KEYWORDS {} |sed -e "s:KEYWORDS=::g" -e "s:\"::g")" else KEYWORDS="$(find ./ -name \*ebuild |grep -v "\-3.5" | sort | tail -n 1 | xargs -i grep KEYWORDS {} |sed -e "s:KEYWORDS=::g" -e "s:\"::g")" fi popd &> /dev/null else - KEYWORDS="~amd64 ~x86" # want to be here, well ask us :] + [[ ${BUMP_VERSION} != *9999 ]] && KEYWORDS="~amd64 ~x86" # want to be here, well ask us :] + fi + if [[ ${BUMP_VERSION} != *9999 ]]; then + [[ -z ${KEYWORDS} ]] && KEYWORDS="~amd64 ~x86" + ekeyword $KEYWORDS ${1} &> /dev/null fi - [[ ${KEYWORDS} = "" ]] && KEYWORDS="~amd64 ~x86" - ekeyword $KEYWORDS ${1} &> /dev/null } # print out help function |