From 4a6bffef932587078abb67a3dcd080554fb9e3fa Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Sun, 17 Oct 1999 09:52:13 +0000 Subject: [PATCH] Add changes from 1.4.1.16 release. Unfortunately it's too late to tag things now :( --- debian/changelog | 11 ++++++-- scripts/dpkg-divert.pl | 4 ++- scripts/update-alternatives.pl | 49 +++------------------------------- 3 files changed, 16 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4c45ff5..f32db4d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dpkg (1.4.1.16) unstable; urgency=low +dpkg (1.4.1.17) unstable; urgency=low * Added --chuid option to start-stop-daemon to allow switching to a different uid when starting a process @@ -10,7 +10,14 @@ dpkg (1.4.1.16) unstable; urgency=low * Made the large info screen show 5 lines of the pkglist so that it scrolled properly, and still showed the cursor - -- Wichert Akkerman Sat, 16 Oct 1999 12:20:10 -0400 + -- Wichert Akkerman UNRELEASED + +dpkg (1.4.1.16) unstable; urgency=medium + + * Hardcode ENOENT again since the errno-part of the POSIX module + isn't in perl-*-base. sigh. + + -- Wichert Akkerman Fri, 15 Oct 1999 04:01:14 +0200 dpkg (1.4.1.15) unstable; urgency=low diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl index beed7f1f..befe47d7 100755 --- a/scripts/dpkg-divert.pl +++ b/scripts/dpkg-divert.pl @@ -1,6 +1,8 @@ #!/usr/bin/perl -- -use POSIX; +#use POSIX; &ENOENT; +sub ENOENT { 2; } +# Sorry about this, but the errno-part of POSIX.pm isn't in perl-*-base $version= '1.0.11'; # This line modified by Makefile sub usageversion { diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl index d528f779..a34f488b 100755 --- a/scripts/update-alternatives.pl +++ b/scripts/update-alternatives.pl @@ -1,6 +1,8 @@ #!/usr/bin/perl -- -use POSIX; +#use POSIX; &ENOENT; +sub ENOENT { 2; } +# Sorry about this, but the errno-part of POSIX.pm isn't in perl-*-base $version= '0.93.80'; # This line modified by Makefile sub usageversion { @@ -14,7 +16,6 @@ Usage: update-alternatives --install update-alternatives --remove update-alternatives --auto update-alternatives --display - update-alternatives --config is the name in /etc/alternatives. is the name referred to. is the link pointing to /etc/alternatives/. @@ -65,7 +66,7 @@ while (@ARGV) { @ARGV >= 2 || &badusage("--remove needs "); ($name,$apath,@ARGV) = @ARGV; $mode= 'remove'; - } elsif (m/^--(display|auto|config)$/) { + } elsif (m/^--(display|auto)$/) { &checkmanymodes; @ARGV || &badusage("--$1 needs "); $mode= $1; @@ -165,15 +166,6 @@ if ($mode eq 'display') { exit 0; } -if ($mode eq 'config') { - if (!$dataread) { - &pr("No alternatives for $name."); - } else { - &config_alternatives($name); - exit 0; - } -} - $best= ''; for ($i=0; $i<=$#versions; $i++) { if ($best eq '' || $priorities[$i] > $bestpri) { @@ -445,37 +437,4 @@ sub badfmt { sub rename_mv { return (rename($_[0], $_[1]) || (system(("mv", $_[0], $_[1])) == 0)); } - -sub config_message { - printf(STDOUT "\nYou have %s package(s) which", $#versions+1); - printf(STDOUT " provide the $name command:\n"); - printf(STDOUT " Selection Command-Name Command\n"); - printf(STDOUT "-----------------------------------------------\n"); - for ($i=0; $i<=$#versions; $i++) { - if (readlink("$altdir/$name") eq $versions[$i]) { - printf(STDOUT "* %s %s %s\n", $i+1, - $name, $versions[$i]); - } else { - printf(STDOUT " %s %s %s\n", $i+1, - $name, $versions[$i]); - } - } - printf(STDOUT "\nWhich selection to supply `$name'?\n"); - printf(STDOUT "Or press ENTER to keep the current (*) selection.\n"); -} - -sub config_alternatives { - do { - &config_message; - $preferred=; - chop($preferred); - } until $preferred eq '' || ($preferred>=1 && $preferred<=$#versions+1); - if ($preferred ne '') { - system("ln -sf $versions[$preferred-1] $altdir/$name"); - if ($?) { - &quit("unable to change link for alternative"); - } - } -} - exit(0); -- 2.39.5