diff options
| author |   espie <espie@openbsd.org> | 2018-06-23 09:19:49 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2018-06-23 09:19:49 +0000 |
| commit | 112aebab9d7d6ccc6352a6f5b81a7dd8ec7db3dd (patch) | |
| tree | 154823d8fcd65182b9c03a7e2fada2e335561e9b | |
| parent | move the tag base code into SolverBase, and use it in PkgCreate, so that (diff) | |
| download | wireguard-openbsd-112aebab9d7d6ccc6352a6f5b81a7dd8ec7db3dd.tar.xz wireguard-openbsd-112aebab9d7d6ccc6352a6f5b81a7dd8ec7db3dd.zip | |
have a default tag value of empty, because.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index 79ce091d419..49c03cf50dd 100644 --- a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm +++ b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Dependencies.pm,v 1.168 2018/06/22 21:29:06 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.169 2018/06/23 09:19:49 espie Exp $ # # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org> # @@ -406,7 +406,7 @@ sub solve_handle_tags $solver->{to_register}{$h}, $state, $tag); # XXX next if $solver->find_in_self($plist, $state, $tag); - $state->errsay("Can't do #1: tag definition not found #2", + $state->errsay("Error in #1: tag definition not found #2", $plist->pkgname, $tag->name); return 0; } diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index 3c2221697f3..5e6b2cf5c26 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingElement.pm,v 1.256 2018/06/22 21:16:01 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.257 2018/06/23 09:19:49 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -1358,7 +1358,7 @@ sub new my ($tag, $params) = split(/\s+/, $args, 2); bless { name => $tag, - params => $params, + params => $params // '', }, $class; } |