summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2011-11-20 10:52:14 +0000
committerespie <espie@openbsd.org>2011-11-20 10:52:14 +0000
commit12f5222e859daa7a49027cc1d22ac7b7959df4e3 (patch)
tree85d90ed0d3c162449e2aaded1e3e537dbb81756e
parentgrammar fix, from jnemeth@netbsd (-r1.48); (diff)
downloadwireguard-openbsd-12f5222e859daa7a49027cc1d22ac7b7959df4e3.tar.xz
wireguard-openbsd-12f5222e859daa7a49027cc1d22ac7b7959df4e3.zip
for the -r option, if we already set an error code (like in -e), reuse that.
allows pkg_info -e 'gettext->=0.20' -r 'gettext->=0.10.38' gettext-0.18.1p0 in one go.
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PkgInfo.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
index c8a26d7ef3c..2fcd2b295e5 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
@@ -1,6 +1,6 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: PkgInfo.pm,v 1.22 2011/08/18 07:55:26 espie Exp $
+# $OpenBSD: PkgInfo.pm,v 1.23 2011/11/20 10:52:14 espie Exp $
#
# Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
#
@@ -507,7 +507,7 @@ sub parse_and_run
join(' ', @l));
}
if (@l != 0) {
- return 0;
+ return $exit_code;
} else {
return 1;
}