The hard versioned dependency is required since that function will have just moved in in 1.195 and we didn't depend on base-installer before
This shouldn't affect users, since apt-mirror-setup is likely pulled in by apt-setup-udeb, which depends on installed-base, provided by bootstrap-base and live-installer, both of which depend on base-installer Ref: https://lists.debian.org/msgid-search/3ff43fa102094f36688749bb866ad72d9580d47a.1592257217.git.nabijaczlew...@gmail.com --- debian/changelog | 8 ++++++++ debian/control | 2 +- generators/50mirror | 16 +++------------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index b434904..61ad8de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt-setup (1:0.158) unstable; urgency=medium + + [ наб ] + * apt-mirror-setup: Depend on base-installer (>= 1.195) + * generators/50mirror: Use is_ports_architecture from base-installer + + -- Holger Wansing <hwans...@mailbox.org> Mon, 15 Jun 2020 23:42:43 +0200 + apt-setup (1:0.157) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 1707e06..4e46e44 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Description: Configure apt Package: apt-mirror-setup Package-Type: udeb Architecture: all -Depends: choose-mirror-bin, ${misc:Depends} +Depends: choose-mirror-bin, base-installer (>= 1.195), ${misc:Depends} Description: set up a mirror in sources.list Package: apt-cdrom-setup diff --git a/generators/50mirror b/generators/50mirror index 42e62ac..e8c60a1 100755 --- a/generators/50mirror +++ b/generators/50mirror @@ -2,6 +2,7 @@ set -e . /usr/share/debconf/confmodule +. /usr/lib/base-installer/library.sh file="$1" @@ -25,22 +26,11 @@ ask_no_mirror() { fi } -is_ports_architecture() { - case "$(chroot /target /usr/bin/dpkg --print-architecture)" in - alpha|hppa|hurd-i386|ia64|kfreebsd-amd64|kfreebsd-i386|m68k|powerpc|ppc64|riscv64|sh4|sparc64|x32) - log "Debian-Ports architecture detected" - return 0 - ;; - *) - return 1 - ;; - esac -} - # For architectures in the Debian-Ports archive, sources.list has to include # an additional entry for the "unreleased" suite. unset use_unreleased -if is_ports_architecture; then +if is_ports_architecture "$(chroot /target /usr/bin/dpkg --print-architecture)"; then + log "Debian-Ports architecture detected" use_unreleased=yes fi -- 2.20.1
signature.asc
Description: PGP signature
