diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2006-05-04 08:36:08 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2006-05-04 08:36:08 +0000 |
| commit | 5a4a8614950ad4214ee396360fc6174d2d35faeb (patch) | |
| tree | 7c7901e437ebb7c20aaf2df0d09d67b3b1a91e0a | |
| parent | 9129cc7937745e4dec0b5200313873e29cf670fd (diff) | |
more clues for people who update their system.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/CollisionReport.pm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm index 45a498632ca..4412c523195 100644 --- a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm +++ b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: CollisionReport.pm,v 1.8 2006/02/06 21:55:58 espie Exp $ +# $OpenBSD: CollisionReport.pm,v 1.9 2006/05/04 08:36:07 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -29,6 +29,7 @@ sub collision_report($$) my %todo = map {($_->fullname(), $_->{md5})} @$list; my $bypkg = {}; my $clueless_bat = 0; + my $clueless_bat2 = 0; print "Collision: the following files already exist\n"; for my $name (keys %todo) { @@ -67,6 +68,9 @@ sub collision_report($$) if ($pkg =~ m/^(?:partial\-|borked\.\d+$)/) { $clueless_bat = $pkg; } + if ($pkg =~ m/^\.libs-*$/) { + $clueless_bat2 = $pkg; + } } if (%todo) { require OpenBSD::md5; @@ -91,6 +95,12 @@ sub collision_report($$) print "\tpkg_delete $clueless_bat\n"; print "will solve the problem\n"; } + if ($clueless_bat2) { + print "The package name $clueless_bat2 suggests remaining libraries\n"; + print "from a former package update. It is likely that\n"; + print "\tpkg_delete $clueless_bat2\n"; + print "will solve the problem\n"; + } } 1; |