d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a nasty bug whereby if the package file didn't have a version number

Browse Source 
then all packages would be deinstalled!

The tightening up of version number checking also fixes a bug where
a package file such as gtk.tgz would have resulting in gtk-engines
being deinstalled.
This commit is contained in:
Paul Richards 2001-01-14 02:05:02 +00:00
parent 165fbe2672
commit 8b9e25b64c
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.sbin/pkg_install/update/pkg_update.pl
View File

@ -51,12 +51,13 @@ sub error ($) {
sub get_version($) {
my ($pkg) = @_;
if ($pkg !~ /-/) {
return("", "");
$pkg =~ /(.+)-([0-9\.]+)/;
if (! $2) {
return($pkg, "");
} else {
return ($1, $2);
}
$pkg =~ s/(.*)\.tgz/$1/;
$pkg =~ /(.+)-(.+)/;
return ($1, $2);
}
sub get_requires($$) {
@ -146,7 +147,6 @@ if (! -f $pkgfile) {
}
my $newpkg = basename($pkgfile, '.tgz');
my ($pkgname, $new_version) = get_version($newpkg);
if ($opt_r && $opt_r ne "") {
@ -159,13 +159,19 @@ if ($opt_r && $opt_r ne "") {
$update_pkg = $pkgname;
}
# Safety net to prevent all packages getting deleted
if ($update_pkg eq "") {
die ("Package to update is empty, aborting\n");
}
# Find out what package versions are already installed
open(PKGINFO, "$PKG_INFO|") || die("Can't run $PKG_INFO, $!");
while (<PKGINFO>) {
my ($pkg) = /^(.*?)\s+.*/;
if ($pkg =~ /^$update_pkg/) {
if ($pkg =~ /^$update_pkg-[0-9\.]+/) {
push(@installed, $pkg);
}
}