common pattern reuse

1 files changed, 2 insertions, 6 deletions

diff --git a/usr.sbin/pkg_add/pkg_merge b/usr.sbin/pkg_add/pkg_merge
index bb4c70f2c82..b65ac17eb0d 100644
--- a/usr.sbin/pkg_add/pkg_merge
+++ b/usr.sbin/pkg_add/pkg_merge
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
-# $OpenBSD: pkg_merge,v 1.15 2010/06/09 10:58:01 espie Exp $
+# $OpenBSD: pkg_merge,v 1.16 2010/06/09 11:57:21 espie Exp $
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -133,11 +133,7 @@ $ui->usage_is('[-v] -o result pkg pkg2 ...');
 
 our ($opt_o, $opt_v);
 
-try {
-	getopts('o:v');
-} catchall {
-	$ui->usage($_);
-};
+$ui->do_options(sub { getopts('o:v'); });
 
 if (!defined $opt_o) {
 	$ui->usage("Missing -o result");