From: Ansgar Burchardt Date: Sun, 12 Feb 2012 15:13:34 +0000 (+0000) Subject: drop mk-extra-overrides.sh script X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77c62d8ce099969468b370ef90806127f31cd925;p=dak drop mk-extra-overrides.sh script This is no longer needed with generate-packages-sources2; external overrides are now handled by dak external-override. Note that this means override.*.extra.* files in .../scripts/override will no longer be updated. --- diff --git a/scripts/debian/byhand-tag b/scripts/debian/byhand-tag index 3e21f025..b169757c 100755 --- a/scripts/debian/byhand-tag +++ b/scripts/debian/byhand-tag @@ -44,7 +44,6 @@ mv "$OUTNONFREE" "$TARGET"tag.non-free chmod 644 "$TARGET"tag "$TARGET"tag.contrib "$TARGET"tag.non-free -(cd $TARGET && $scriptsdir/mk-extra-overrides.sh) (cd "$TARGET" \ && dak external-overrides import unstable main Tag &2 - exit 1 -elif [ ! -L "$apath/testing" ]; then - echo "$0: symlink for testing suite does not exist >&2" - exit 1 -fi - -codename_testing="$(basename "$(readlink "$apath/testing")")" -if [ -z "$codename_testing" ] || [ ! -d "$apath/$codename_testing" ]; then - echo "$0: invalid codename for testing suite ('$codename_testing')" >&2 - exit 1 -fi - -for s in "$codename_testing" sid; do - for c in main contrib non-free; do - echo "Making $opath/override.$s.extra.$c" - if [ "$c" = "main" ]; then - c2=""; - else - c2=".$c" - fi - for t in $x; do - if [ -e "$t$c2" ]; then cat $t$c2; fi - if [ -e "$t.$s$c2" ]; then cat $t.$s$c2; fi - done | sort > $opath/override.$s.extra.$c - done -done -