X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=7cd759a9af32bbb9909918d4d94e3ed78dd93c34;hb=3a64a5595f9065460c8c60f1b14f3cc023b5f10c;hp=599f8dc55a02c517cfc3e39852a253b9c1161064;hpb=0dfcad8b764f61ff359a426bc9f7be966e5f6d9f;p=dak.git diff --git a/config/debian/common b/config/debian/common index 599f8dc5..7cd759a9 100644 --- a/config/debian/common +++ b/config/debian/common @@ -43,26 +43,6 @@ function make_buildd_dir () { find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf } -# move accepted NEW packages from stagedir into queue/accepted -function acceptnew () { - cd $newstage - for file in $(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs); do - sed '1,/Files:/d' "${file}" | sed '/BEGIN PGP SIGNATURE/,$d' \ - | while read notused1 notused2 notused3 notused4 NAME; do - if [ -z "${NAME}" ]; then - # Sometimes there is a newline after the Files:, ignore it - continue - fi - if [ -f "${NAME}" ]; then - mv --target-directory="${accepted}" "${NAME}" - else - log_error "Error, couldn't find file ${NAME} to move to ${accepted}" - fi - done - mv --target-directory="${accepted}" "${file}" "${file%%.changes}.dak" - done -} - # Do the unchecked processing, in case we have files. function do_unchecked () { cd $unchecked @@ -73,7 +53,7 @@ function do_unchecked () { UNCHECKED_WITHOUT_LOCK=${UNCHECKED_WITHOUT_LOCK:-""} echo "$timestamp": ${changes:-"Nothing to do"} >> $report - dak process-unchecked -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report + dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report } function sync_debbugs () {