diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2003-10-20 17:29:57 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2003-10-20 17:29:57 +0000 |
| commit | 3acc3b71749c9f502dc52a025cc6165d3dddb398 (patch) | |
| tree | 89edb97ddbbc718d7abbf97f8690d1ffed8cc755 /usr.sbin/pkg_add | |
| parent | 311fd4b365276033733ce3c51f601a7f9492c314 (diff) | |
Missing undef. conflicts is an error.
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index f652b00e87a..f4b1f2526de 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.2 2003/10/19 18:42:55 espie Exp $ +# $OpenBSD: pkg_add,v 1.3 2003/10/20 17:29:56 espie Exp $ # # Copyright (c) 2003 Marc Espie. # @@ -146,6 +146,7 @@ sub preadd $handle->{conflicts} = $l; if ($l->conflicts_with(installed_packages())) { print "package $pkg has conflicts\n"; + return undef; } return $handle; } |