From bf7b7265435637696fa865c667669e8783e80bc1 Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 7 Jan 2014 13:37:23 +0000 Subject: [PATCH] recognize special file +META --- usr.sbin/pkg_add/OpenBSD/PackageInfo.pm | 8 +++++--- usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm b/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm index 55f528f8e52..0eee57e648a 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageInfo.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageInfo.pm,v 1.56 2011/08/23 10:32:27 espie Exp $ +# $OpenBSD: PackageInfo.pm,v 1.57 2014/01/07 13:37:23 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie # @@ -23,7 +23,8 @@ require Exporter; our @ISA=qw(Exporter); our @EXPORT=qw(installed_packages installed_info installed_name info_names is_info_name installed_stems lock_db unlock_db - add_installed delete_installed is_installed borked_package CONTENTS COMMENT DESC + add_installed delete_installed is_installed borked_package + CONTENTS COMMENT DESC META REQUIRED_BY REQUIRING DISPLAY UNDISPLAY); use OpenBSD::PackageName; @@ -32,6 +33,7 @@ use constant { CONTENTS => '+CONTENTS', COMMENT => '+COMMENT', DESC => '+DESC', + META => '+META', REQUIRED_BY => '+REQUIRED_BY', REQUIRING => '+REQUIRING', DISPLAY => '+DISPLAY', @@ -42,7 +44,7 @@ my $pkg_db = $ENV{"PKG_DBDIR"} || OpenBSD::Paths->pkgdb; my ($list, $stemlist); -our @info = (CONTENTS, COMMENT, DESC, REQUIRED_BY, REQUIRING, DISPLAY, UNDISPLAY); +our @info = (CONTENTS, COMMENT, DESC, META, REQUIRED_BY, REQUIRING, DISPLAY, UNDISPLAY); our %info = (); for my $i (@info) { diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index 0c3abc85d00..ee7ad35610b 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.222 2014/01/07 13:31:36 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.223 2014/01/07 13:37:23 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie # @@ -1714,6 +1714,10 @@ package OpenBSD::PackingElement::FDESC; our @ISA=qw(OpenBSD::PackingElement::SpecialFile); sub name() { OpenBSD::PackageInfo::DESC } +package OpenBSD::PackingElement::FMETA; +our @ISA=qw(OpenBSD::PackingElement::SpecialFile); +sub name() { OpenBSD::PackageInfo::META } + package OpenBSD::PackingElement::DisplayFile; our @ISA=qw(OpenBSD::PackingElement::SpecialFile); use OpenBSD::Error; -- 2.20.1