Joerg Jaspert pushed to branch master at Debian FTP Team / dak
Commits:
-
99bebb24
by Joerg Jaspert at 2018-04-08T21:50:48+02:00
2 changed files:
Changes:
| ... | ... | @@ -127,11 +127,11 @@ function punew_do() { |
| 127 | 127 |
|
| 128 | 128 |
STAMP=${STAMP:-$(date "+%Y%m%d%H%M")}
|
| 129 | 129 |
|
| 130 |
- local exportdir="${qdir}/tree/${STAMP}"
|
|
| 130 |
+ local ppexportdir="${qdir}/tree/${STAMP}"
|
|
| 131 | 131 |
local targetdir="${qdir}/export"
|
| 132 |
- mkdir -p -- ${exportdir}
|
|
| 133 |
- dak export -q "${queue}" -d "${exportdir}" --all
|
|
| 134 |
- ln -sfT ${exportdir} ${targetdir}
|
|
| 132 |
+ mkdir -p -- ${ppexportdir}
|
|
| 133 |
+ dak export -q "${queue}" -d "${ppexportdir}" --all
|
|
| 134 |
+ ln -sfT ${ppexportdir} ${targetdir}
|
|
| 135 | 135 |
find "${qdir}/tree" -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
|
| 136 | 136 |
}
|
| 137 | 137 |
|
| ... | ... | @@ -210,17 +210,17 @@ function dedup() { |
| 210 | 210 |
|
| 211 | 211 |
function mkmaintainers() {
|
| 212 | 212 |
local archiveroot
|
| 213 |
- local indices
|
|
| 213 |
+ local mkmindices
|
|
| 214 | 214 |
|
| 215 | 215 |
log 'Creating Maintainers index ... '
|
| 216 | 216 |
|
| 217 | 217 |
for archive in "${public_archives[@]}"; do
|
| 218 | 218 |
archiveroot="$(get_archiveroot "${archive}")"
|
| 219 |
- indices="${archiveroot}/indices"
|
|
| 220 |
- if ! [[ -d ${indices} ]]; then
|
|
| 221 |
- mkdir "${indices}"
|
|
| 219 |
+ mkmindices="${archiveroot}/indices"
|
|
| 220 |
+ if ! [[ -d ${mkmindices} ]]; then
|
|
| 221 |
+ mkdir "${mkmindices}"
|
|
| 222 | 222 |
fi
|
| 223 |
- cd "${indices}"
|
|
| 223 |
+ cd "${mkmindices}"
|
|
| 224 | 224 |
|
| 225 | 225 |
rm -f Maintainers Maintainers.gz Uploaders Uploaders.gz
|
| 226 | 226 |
dak make-maintainers -a "${archive}" ${scriptdir}/masterfiles/pseudo-packages.maintainers
|