diff options
| author |   espie <espie@openbsd.org> | 2007-05-30 12:27:19 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2007-05-30 12:27:19 +0000 |
| commit | 62e973e422085c9dd30573eb789dbad2b4c30295 (patch) | |
| tree | 9d4e5494a9b98863b161ccc7b2b5c1e5c9160b6e | |
| parent | fix this for ubt.c (diff) | |
| download | wireguard-openbsd-62e973e422085c9dd30573eb789dbad2b4c30295.tar.xz wireguard-openbsd-62e973e422085c9dd30573eb789dbad2b4c30295.zip | |
allow for removing colliding files... very dangerous.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/CollisionReport.pm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm b/usr.sbin/pkg_add/OpenBSD/CollisionReport.pm index 6704d1a1eb2..5b0ae16bebc 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.11 2007/05/02 15:05:29 espie Exp $ +# $OpenBSD: CollisionReport.pm,v 1.12 2007/05/30 12:27:19 espie Exp $ # # Copyright (c) 2003-2006 Marc Espie <espie@openbsd.org> # @@ -26,6 +26,14 @@ use OpenBSD::Vstat; sub collision_report($$) { my ($list, $state) = @_; + + if ($state->{forced}->{removecollisions}) { + for my $f (@$list) { + print "rm ", $f->fullname, "\n"; + unlink($f->fullname); + } + return; + } my %todo = map {($_->fullname, $_->{md5})} @$list; my $bypkg = {}; my $clueless_bat = 0; |