diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-12-12 22:44:52 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-12-12 22:44:52 +0000 |
| commit | ce7bc7b1be098af7cf72698d7043cd6107f09704 (patch) | |
| tree | 279020a237932cb04dee436229233ea9bd501580 | |
| parent | a4e2055729d220a26438f05e54178b77ba8609b1 (diff) | |
cvs expands $OpenBSD...$, so move the variable defs up so that they don't
need a full name.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Error.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Error.pm b/usr.sbin/pkg_add/OpenBSD/Error.pm index 32d08ebc662..be652eb656f 100644 --- a/usr.sbin/pkg_add/OpenBSD/Error.pm +++ b/usr.sbin/pkg_add/OpenBSD/Error.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Error.pm,v 1.9 2004/12/12 11:26:16 espie Exp $ +# $OpenBSD: Error.pm,v 1.10 2004/12/12 22:44:51 espie Exp $ # # Copyright (c) 2004 Marc Espie <espie@openbsd.org> # @@ -23,6 +23,8 @@ our @ISA=qw(Exporter); our @EXPORT=qw(System VSystem Copy Fatal Warn Usage set_usage try throw catch catchall rethrow); +our ($FileName, $Line, $FullMessage); + sub System { my $r = system(@_); @@ -164,9 +166,9 @@ sub dienow if ($error) { if ($error =~ m/^(Expected:\s+)?(.*?)(?:\s+at\s+(.*)\s+line\s+(\d+)\.?)?$/) { local $_ = $2; - $OpenBSD: Error.pm,v 1.9 2004/12/12 11:26:16 espie Exp $3; - $OpenBSD: Error.pm,v 1.9 2004/12/12 11:26:16 espie Exp $4; - $OpenBSD: Error.pm,v 1.9 2004/12/12 11:26:16 espie Exp $error; + $FileName = $3; + $Line = $4; + $FullMessage = $error; $handler->exec($error, $1, $2, $3, $4); } else { @@ -205,8 +207,6 @@ sub catchall(&) bless $_[0], "OpenBSD::Error::catchall"; } -our ($FileName, $Line, $FullMessage); - package OpenBSD::Error::catch; sub exec { |