diff --git a/build.sh b/build.sh index 6d55badb5..53e2ccb08 100755 --- a/build.sh +++ b/build.sh @@ -92,7 +92,7 @@ if shouldbuild "$SRCNAME.dsc" "$PKGNAME/debian/changelog" ]; then # extract old tarball into new directory, to avoid "modified files" problems with dpkg-source later ( cd "$PKGNAME" && dpkg-source --after-build . && tar --strip-components=1 -xf "../${DEBSRC}_${UPSVER}.orig.tar.gz" ) fi - ( cd "$PKGNAME" && dpkg-buildpackage -d -S --no-sign -nc ) + ( cd "$PKGNAME" && dpkg-buildpackage -d -S --no-sign ) # sign if not UNRELEASED if echo "$DEBDIST" | grep -qv UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; then debsign ${DEBSIGN_KEYID:+-k $DEBSIGN_KEYID} "${SRCNAME}_source.changes" diff --git a/dev/list-rdeps.sh b/dev/list-rdeps.sh index 50a0a500d..204a486cf 100755 --- a/dev/list-rdeps.sh +++ b/dev/list-rdeps.sh @@ -22,19 +22,19 @@ grep_sources_entry() { grep '^deb[^#]*://[^#[:space:]]*[[:space:]]*'"$@" } -# if ! grep_sources_entry "$ARCHIVE" -qR /etc/apt/sources.list /etc/apt/sources.list.d/ || \ -# ! grep_sources_entry "$ARCHIVT" -qR /etc/apt/sources.list /etc/apt/sources.list.d/; then -# cat <<-eof -# To make this script work, you will need Debian Testing *AND* Debian Unstable -# in your sources.list. If you want your system to prefer Debian Testing, be -# sure to also add these lines to your /etc/apt/apt.conf: +if ! grep_sources_entry "$ARCHIVE" -qR /etc/apt/sources.list /etc/apt/sources.list.d/ || \ + ! grep_sources_entry "$ARCHIVT" -qR /etc/apt/sources.list /etc/apt/sources.list.d/; then + cat <<-eof +To make this script work, you will need Debian Testing *AND* Debian Unstable +in your sources.list. If you want your system to prefer Debian Testing, be +sure to also add these lines to your /etc/apt/apt.conf: -# APT::Default-Release "$ARCHIVT"; +APT::Default-Release "$ARCHIVT"; -# After these changes, make sure to re-run \`apt-get update\`. -# eof -# exit 1 -# fi +After these changes, make sure to re-run \`apt-get update\`. +eof + exit 1 +fi if [ $(($(date +%s) - $(stat -c %Y /var/cache/apt/pkgcache.bin))) -gt 7200 ]; then read -p "APT cache is a bit old, update? [Y/n] " x