diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-12-18 13:48:24 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-12-18 13:48:24 +0000 |
| commit | 70ce78a5f1e6252885bad05fb42a31f500ab77ce (patch) | |
| tree | 5b566eaf95eeee532aff33ac4c91142ac142c224 /usr.sbin/pkg_add/OpenBSD | |
| parent | d9d2b585d2f84d2d9aed7616d4f58321795a739e (diff) | |
ignore size issues in kitchensink pretend mode.
Be consistent: show added files and deleted files if pretending.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index 2db732a77d6..297568857ed 100644 --- a/usr.sbin/pkg_add/OpenBSD/Add.pm +++ b/usr.sbin/pkg_add/OpenBSD/Add.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Add.pm,v 1.26 2004/12/17 11:26:21 espie Exp $ +# $OpenBSD: Add.pm,v 1.27 2004/12/18 13:48:23 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -90,6 +90,9 @@ sub validate_plist($$) Warn "Error: ", $s->{dev}, " is read-only ($fname)\n"; $problems++; } + if ($state->{forced}->{kitchensink} && $state->{not}) { + next; + } if ($s->avail() < 0) { Warn "Error: ", $s->{dev}, " is not large enough ($fname)\n"; $problems++; @@ -294,13 +297,13 @@ sub install } else { rename($self->{tempname}, $destdir.$fullname) or Fatal "Can't move ", $self->{tempname}, " to $fullname: $!"; - print "moving ", $self->{tempname}, " -> $destdir$fullname\n" if $state->{very_verbose}; + print "moving ", $self->{tempname}, " -> $destdir$fullname\n" if $state->{beverbose}; undef $self->{tempname}; } } else { my $file = $self->prepare_to_extract($state); - print "extracting $destdir$fullname\n" if $state->{very_verbose}; + print "extracting $destdir$fullname\n" if $state->{beverbose}; return if $state->{not}; $file->create(); } |