diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-12-16 11:18:45 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-12-16 11:18:45 +0000 |
| commit | 556a76d142d692bc7e81e0d2dc23ef8aed079856 (patch) | |
| tree | 37f93aa140829e9ca7cc2577b6f15f450389205c /usr.sbin/pkg_add/OpenBSD/CollisionReport.pm | |
| parent | 86ea81e339aeb4d313b38518a231be63f4ca9d87 (diff) | |
both borked.* and partial-* are recognized.
give the right pkg_delete command
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/CollisionReport.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/CollisionReport.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm index b28eda98c5c..ec166fc7f3b 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.5 2004/12/16 11:07:33 espie Exp $ +# $OpenBSD: CollisionReport.pm,v 1.6 2004/12/16 11:18:44 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -52,7 +52,7 @@ sub collision_report($$) for my $item (sort @{$bypkg->{$pkg}}) { print "\t$item ($pkg)\n"; } - if ($pkg =~ m/^partial\-/) { + if ($pkg =~ m/^(?:partial\-|borked\.\d+$)/) { $clueless_bat = $pkg; } } @@ -76,7 +76,7 @@ sub collision_report($$) if ($clueless_bat) { print "The package name $clueless_bat suggests that a former installation\n"; print "of a similar package got interrupted. It is likely that\n"; - print "\tpkg_delete borked.*\n"; + print "\tpkg_delete $clueless_bat\n"; print "will solve the problem\n"; } } |