diff options
| author |   espie <espie@openbsd.org> | 2014-07-08 17:02:56 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2014-07-08 17:02:56 +0000 |
| commit | d9c6d5cc0f3ad885f1d84e514d929cd54f52540b (patch) | |
| tree | c9fc437f45891f5ade20804e5061bdd4c0a33341 | |
| parent | in case we say("Some parameter #1 blabla there") but we (diff) | |
| download | wireguard-openbsd-d9c6d5cc0f3ad885f1d84e514d929cd54f52540b.tar.xz wireguard-openbsd-d9c6d5cc0f3ad885f1d84e514d929cd54f52540b.zip | |
don't really bother cleaning up the callback, it will go away soon enough
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageLocation.pm | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm index 207fb71b571..51ea7bc1e3f 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageLocation.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageLocation.pm,v 1.42 2014/07/08 07:59:05 espie Exp $ +# $OpenBSD: PackageLocation.pm,v 1.43 2014/07/08 17:02:56 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -100,7 +100,7 @@ sub _opened sub _set_callback { my $self = shift; - if (defined $self->{_archive}) { + if (defined $self->{callback} && defined $self->{_archive}) { $self->{_archive}->set_callback($self->{callback}); } } diff --git a/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm b/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm index 62a1a42a26d..f2cf4aa9a5e 100644 --- a/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm +++ b/usr.sbin/pkg_add/OpenBSD/ProgressMeter/Term.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Term.pm,v 1.27 2014/07/08 07:59:05 espie Exp $ +# $OpenBSD: Term.pm,v 1.28 2014/07/08 17:02:56 espie Exp $ # # Copyright (c) 2004-2007 Marc Espie <espie@openbsd.org> # @@ -309,13 +309,4 @@ sub advance } } -sub saved -{ - my $self = shift; - $self->SUPER::saved; - if (defined $self->{state}{archive}) { - $self->{state}{archive}->set_callback; - } -} - 1; |