| ... |
... |
@@ -174,7 +174,9 @@ while :; do |
|
174
|
174
|
fi
|
|
175
|
175
|
done
|
|
176
|
176
|
|
|
|
177
|
+log "Merging the ${pusuite}-debug into ${suite}-debug"
|
|
177
|
178
|
dak control-suite --add ${suite}-debug < ${pusuite}-debug.list
|
|
|
179
|
+log "Cleaning ${pusuite} and ${pusuite}-debug"
|
|
178
|
180
|
dak control-suite --remove ${pusuite} < ${pusuite}.list
|
|
179
|
181
|
dak control-suite --remove ${pusuite}-debug < ${pusuite}-debug.list
|
|
180
|
182
|
|
| ... |
... |
@@ -196,8 +198,9 @@ propups() { |
|
196
|
198
|
local target_suite="${1}"
|
|
197
|
199
|
local f="${2:-propups.${target_suite}}"
|
|
198
|
200
|
if ${wget} -O "${f}" "${release_base}/${f}"; then
|
|
199
|
|
- echo "Please check ${f}"
|
|
|
201
|
+ echo "Please check ${f} (will open an editor for you)"
|
|
200
|
202
|
confirm
|
|
|
203
|
+ $EDITOR ${f}
|
|
201
|
204
|
dak control-suite --force --add ${target_suite} < ${f}
|
|
202
|
205
|
fi
|
|
203
|
206
|
}
|
| ... |
... |
@@ -212,7 +215,7 @@ log "RM time" |
|
212
|
215
|
hadrms=0
|
|
213
|
216
|
|
|
214
|
217
|
if ${wget} -O "removallist" "${release_base}/removals.${suitename}"; then
|
|
215
|
|
- echo "Please check removallist file, I am going to run it as shell script when you confirm"
|
|
|
218
|
+ echo "Please check removallist file, I am going to run it as shell script when you confirm (will open an editor for you)"
|
|
216
|
219
|
confirm
|
|
217
|
220
|
$EDITOR removallist
|
|
218
|
221
|
bash removallist
|
| ... |
... |
@@ -239,7 +242,7 @@ done |
|
239
|
242
|
set -e
|
|
240
|
243
|
|
|
241
|
244
|
if [[ ${hadrms} -ne 0 ]]; then
|
|
242
|
|
- echo "You did some removals, please copy their entries into the changelog"
|
|
|
245
|
+ echo "You did some removals, please copy their entries into the changelog (will open an editor for you)"
|
|
243
|
246
|
confirm
|
|
244
|
247
|
$EDITOR ${ftpdir}/dists/${suite}/ChangeLog ${webdir}/removals.txt
|
|
245
|
248
|
rm -f ${ftpdir}/dists/${suite}/ChangeLog~
|
| ... |
... |
@@ -310,7 +313,7 @@ echo "Now check if it looks good" |
|
310
|
313
|
for f in README README.html dists/README dists/${suite}/ChangeLog; do
|
|
311
|
314
|
diff -u ${mirrordir}/ftp-master/${f} ${ftpdir}/${f} || :
|
|
312
|
315
|
done
|
|
313
|
|
-read -e -p "Does the diff look ok? Enter anything if not, empty if yes" diffcheck
|
|
|
316
|
+read -e -p "Does the diff look ok? Enter anything if not, empty if yes (if nonempty, I will open an editor for you)" diffcheck
|
|
314
|
317
|
if [[ -n ${diffcheck} ]]; then
|
|
315
|
318
|
cd ${ftpdir}/dists/${suite}
|
|
316
|
319
|
$EDITOR ChangeLog ../README ../../README ../../README.html
|
| ... |
... |
@@ -340,7 +343,7 @@ while :; do |
|
340
|
343
|
log "cruft-report"
|
|
341
|
344
|
dak cruft-report -s ${suite}
|
|
342
|
345
|
echo "Anything to remove? If so, copy/paste commands into another window, have fun"
|
|
343
|
|
- echo "When done, continue here. Enter anything if you got removals, empty if not"
|
|
|
346
|
+ echo "When done, continue here. Enter anything if you got removals, empty if not (will rerun dominate/cruft-report then)"
|
|
344
|
347
|
read -e -p "Anything removed?" -i "yes" removedstuff
|
|
345
|
348
|
if [[ -n ${removedstuff} ]]; then
|
|
346
|
349
|
hadremove=1
|
| ... |
... |
@@ -351,8 +354,10 @@ while :; do |
|
351
|
354
|
done
|
|
352
|
355
|
|
|
353
|
356
|
if [[ ${hadremove} -ne 0 ]]; then
|
|
354
|
|
- echo "You did some removals, please copy their entries into the changelog"
|
|
|
357
|
+ echo "You did some removals, please copy their entries into the changelog (will open an editor for you)"
|
|
|
358
|
+ confirm
|
|
355
|
359
|
$EDITOR ${ftpdir}/dists/${suite}/ChangeLog ${webdir}/removals.txt
|
|
|
360
|
+ rm -f -- ${ftpdir}/dists/${suite}/ChangeLog~
|
|
356
|
361
|
fi
|
|
357
|
362
|
|
|
358
|
363
|
log "Cleaning up debug suite"
|