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).
This commit is contained in:
parent
f04a536617
commit
5249ec662b
@ -128,6 +128,7 @@ find_ebuilds() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
SC_CP=
|
SC_CP=
|
||||||
|
SC_REMOVED_PACKAGE_LIST=
|
||||||
# Now we can have multiple packages around.
|
# Now we can have multiple packages around.
|
||||||
for pkg in ${SC_CHANGE_LIST}; do
|
for pkg in ${SC_CHANGE_LIST}; do
|
||||||
if [ -z "${category}" ]; then
|
if [ -z "${category}" ]; then
|
||||||
@ -138,8 +139,12 @@ find_ebuilds() {
|
|||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
SC_CP=${SC_CP:+${SC_CP}, }${category}${pkg}
|
SC_CP=${SC_CP:+${SC_CP}, }${category}${pkg}
|
||||||
|
SC_REMOVED_PACKAGE_LIST=${SC_REMOVED_PACKAGE_LIST:+${SC_REMOVED_PACKAGE_LIST} }${category}${pkg}
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Replace with the filtered version
|
||||||
|
SC_CHANGE_LIST=${SC_REMOVED_PACKAGE_LIST}
|
||||||
|
|
||||||
local root sdir
|
local root sdir
|
||||||
root=${category:+../}
|
root=${category:+../}
|
||||||
|
|
||||||
@ -439,7 +444,7 @@ main() {
|
|||||||
package-removal)
|
package-removal)
|
||||||
vcs_status ${SC_CHANGE_LIST}
|
vcs_status ${SC_CHANGE_LIST}
|
||||||
echo
|
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}"
|
say "${BGREEN}${SC_CP}: ${commitmsg}${RESET}"
|
||||||
confirm
|
confirm
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user