From 5249ec662bfe630284de982c2f1c81ca88cf4b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 12 Aug 2010 22:38:18 +0200 Subject: [PATCH] Filter SC_CHANGE_LIST completely, introduce SC_REMOVED_PACKAGE_LIST. When filtering SC_CHANGE_LIST entries for SC_CP, filter the SC_CHANGE_LIST variable as well. Additionally, create SC_REMOVED_PACKAGE_LIST as a clean copy of the list (without eclass/license/profile changes appended). --- sunrise-commit | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sunrise-commit b/sunrise-commit index 38fc8b6..31bd285 100755 --- a/sunrise-commit +++ b/sunrise-commit @@ -128,6 +128,7 @@ find_ebuilds() { fi SC_CP= + SC_REMOVED_PACKAGE_LIST= # Now we can have multiple packages around. for pkg in ${SC_CHANGE_LIST}; do if [ -z "${category}" ]; then @@ -138,8 +139,12 @@ find_ebuilds() { esac fi SC_CP=${SC_CP:+${SC_CP}, }${category}${pkg} + SC_REMOVED_PACKAGE_LIST=${SC_REMOVED_PACKAGE_LIST:+${SC_REMOVED_PACKAGE_LIST} }${category}${pkg} done + # Replace with the filtered version + SC_CHANGE_LIST=${SC_REMOVED_PACKAGE_LIST} + local root sdir root=${category:+../} @@ -439,7 +444,7 @@ main() { package-removal) vcs_status ${SC_CHANGE_LIST} echo - say "Ready to commit ${WHITE}$(echo ${SC_CHANGE_LIST} | wc -w)${RESET} package removal(s), with commit message:" + say "Ready to commit ${WHITE}$(echo ${SC_REMOVED_PACKAGE_LIST} | wc -w)${RESET} package removal(s), with commit message:" say "${BGREEN}${SC_CP}: ${commitmsg}${RESET}" confirm