diff options
| author |   espie <espie@openbsd.org> | 2007-05-20 14:21:33 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2007-05-20 14:21:33 +0000 |
| commit | 29dbc98a58a947bd2db0bf7cc2420ed225663259 (patch) | |
| tree | 7bb27efc0908ede4d37e35d19ba74e760527692b | |
| parent | Check for codec presence in match(), and don't attach if none is found. (diff) | |
| download | wireguard-openbsd-29dbc98a58a947bd2db0bf7cc2420ed225663259.tar.xz wireguard-openbsd-29dbc98a58a947bd2db0bf7cc2420ed225663259.zip | |
create specific `state' objects for pkg_add and pkg_delete, so that I can
write shortcuts for common behavior, and start hiding some details.
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 7 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_delete | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index 4cf5b0919c7..4e56996ccdf 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.256 2007/05/20 14:04:39 espie Exp $ +# $OpenBSD: pkg_add,v 1.257 2007/05/20 14:21:33 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -41,8 +41,11 @@ my $bad = 0; our %forced = (); our $not; +package OpenBSD::pkg_add::State; +our @ISA=(qw(OpenBSD::Error)); +package main; sub can_install($$$) { my ($plist, $state, $handle) = @_; @@ -640,7 +643,7 @@ try { try { $opt_L = '/usr/local' unless defined $opt_L; -my $state = new OpenBSD::Error; +my $state = OpenBSD::pkg_add::State->new; $state->{cache} = {}; $state->{installed} = {}; $state->{deptree} = {}; diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete index 61fad83095d..5a6707a22f7 100644 --- a/usr.sbin/pkg_add/pkg_delete +++ b/usr.sbin/pkg_add/pkg_delete @@ -1,6 +1,6 @@ #!/usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_delete,v 1.100 2007/05/20 14:04:39 espie Exp $ +# $OpenBSD: pkg_delete,v 1.101 2007/05/20 14:21:33 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -32,6 +32,11 @@ use OpenBSD::Vstat; our %forced = (); our $not; +package OpenBSD::pkg_delete::State; +our @ISA=(qw(OpenBSD::Error)); + +package main; + set_usage('pkg_delete [-cIinqvx] [-B pkg-destdir] [-F keywords] pkg-name [...]'); our ($opt_v, $opt_D, $opt_d, $opt_n, $opt_q, $opt_p, $opt_c, $opt_L, $opt_B, $opt_I, $opt_i, $opt_x); @@ -78,7 +83,7 @@ my %done; my $removed; try { -my $state = new OpenBSD::Error; +my $state = OpenBSD::pkg_delete::State->new; $state->{not} = $opt_n; # XXX RequiredBy $not = $opt_n; |