From 28ca0f9a4fef0c9b1ffc4d9d331e28cfdde19d9f Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 11 Sep 2018 09:43:08 +0000 Subject: [PATCH] add the conflict info to what's stored in pkglocatedb, as it's meta-info that's not readily available otherwise. --- usr.sbin/pkg_add/pkg_mklocatedb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/usr.sbin/pkg_add/pkg_mklocatedb b/usr.sbin/pkg_add/pkg_mklocatedb index 295b48237fa..c17522aab3f 100644 --- a/usr.sbin/pkg_add/pkg_mklocatedb +++ b/usr.sbin/pkg_add/pkg_mklocatedb @@ -1,6 +1,6 @@ #! /usr/bin/perl # Copyright (c) 2005-2010 Marc Espie -# $OpenBSD: pkg_mklocatedb,v 1.45 2018/07/11 09:57:59 espie Exp $ +# $OpenBSD: pkg_mklocatedb,v 1.46 2018/09/11 09:43:08 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 @@ -101,6 +101,18 @@ sub print_name $self->keyword, " ", $self->{expanded}, "\n"; } +package OpenBSD::PackingElement::Conflict; +sub print_name +{ + &OpenBSD::PackingElement::Action::print_name; +} + +package OpenBSD::PackingElement::NoDefaultConflict; +sub print_name +{ + &OpenBSD::PackingElement::Action::print_name; +} + package OpenBSD::PackingElement::TagBase; sub print_name { -- 2.20.1