proxmox-mirrors/debcargo-conf
1
0
Fork 0
mirror of https://git.proxmox.com/git/debcargo-conf synced 2025-04-28 16:24:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert unintentional changes to build.sh and dev/list-rdeps.sh

Browse Source 
This reverts parts of commit 30c39d24f2.
This commit is contained in:
Sebastian Ramacher 2022-08-18 22:35:47 +02:00
parent 99a302c804
commit 07c47c7db0
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -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"

22
dev/list-rdeps.sh
View File

@ -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