summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2007-03-07 00:09:47 +0000
committerMarc Espie <espie@cvs.openbsd.org>2007-03-07 00:09:47 +0000
commit35e1cec9b1ef87f9975110989f202fe2cf790b60 (patch)
tree933911a32c83d187dd070fedcca463a585c4e5a7
parent0faf0a7e0f270ec94f2e707486b64c78f5f65d13 (diff)
revert size check tweak, the fix does break other stuff. this is harder
than I thought...
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Vstat.pm20
-rw-r--r--usr.sbin/pkg_add/pkg_add4
2 files changed, 2 insertions, 22 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Vstat.pm b/usr.sbin/pkg_add/OpenBSD/Vstat.pm
index 3364d7bf33f..7308f680b2e 100644
--- a/usr.sbin/pkg_add/OpenBSD/Vstat.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Vstat.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Vstat.pm,v 1.16 2007/03/06 23:35:01 espie Exp $
+# $OpenBSD: Vstat.pm,v 1.17 2007/03/07 00:09:46 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -44,24 +44,6 @@ sub create_device($)
return $n;
}
-sub remember_used
-{
- my $h = {};
- while (my ($k, $v) = each %$devinfo) {
- $h->{$k} = $v->{used};
- $v->{used} = 0;
- }
- return $h;
-}
-
-sub restore_used
-{
- my $h = shift;
- while (my ($k, $v) = each %$h) {
- $devinfo->{$k}->{used} += $v;
- }
-}
-
sub init_devices()
{
delete $ENV{'BLOCKSIZE'};
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index 08dc7bc4597..e4e720bd84b 100644
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.222 2007/03/06 23:35:01 espie Exp $
+# $OpenBSD: pkg_add,v 1.223 2007/03/07 00:09:46 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -280,9 +280,7 @@ sub really_add($$)
}
print "\n";
}
- my $x = OpenBSD::Vstat::remember_used();
my $totsize = OpenBSD::Add::validate_plist($plist, $state);
- OpenBSD::Vstat::restore_used($x);
if (!defined $handle) {
Fatal "Archive in $pkgname broken";