From a2e93a13d58b380fbff926e9aa0d8d6fa8895a57 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sat, 30 Mar 2019 17:22:56 -0500 Subject: [PATCH] Make sure the removal packages aren't mistakenly treated as arguments. --- run-ppa-britney | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-ppa-britney b/run-ppa-britney index 297c7d6..c2b01b3 100755 --- a/run-ppa-britney +++ b/run-ppa-britney @@ -21,8 +21,8 @@ for RELEASE in $RELEASES; do COPY="./ubuntu-archive-tools/copy-package" REMOVE="./ubuntu-archive-tools/remove-package" if echo ${package[0]} | egrep -q "^-"; then - $COPY -y -b -s $RELEASE --from "ppa:$LP_TEAM/ubuntu/$DEST_PPA" --to "ppa:$LP_TEAM/ubuntu/$SOURCE_PPA" --version "${package[1]}" "${package[0]}"; - $REMOVE -y -s $RELEASE --archive "ppa:$LP_TEAM/ubuntu/$DEST_PPA" --version "${package[1]}" --removal-comment="demoted to proposed" "${package[0]}"; + $COPY -y -b -s $RELEASE --from "ppa:$LP_TEAM/ubuntu/$DEST_PPA" --to "ppa:$LP_TEAM/ubuntu/$SOURCE_PPA" --version "${package[1]}" "`echo ${package[0]} | sed 's/-//'`"; + $REMOVE -y -s $RELEASE --archive "ppa:$LP_TEAM/ubuntu/$DEST_PPA" --version "${package[1]}" --removal-comment="demoted to proposed" "`echo ${package[0]} | sed 's/-//'`"; else $COPY -y -b -s $RELEASE --from "ppa:$LP_TEAM/ubuntu/$SOURCE_PPA" --to "ppa:$LP_TEAM/ubuntu/$DEST_PPA" --version "${package[1]}" "${package[0]}"; $REMOVE -y -s $RELEASE --archive "ppa:$LP_TEAM/ubuntu/$SOURCE_PPA" --version "${package[1]}" --removal-comment="moved to release" "${package[0]}";