diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2016-07-27 12:58:22 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2016-07-27 12:58:22 +0000 |
| commit | 9b53ce13dadc96d3d288e91e2e56e5e460289230 (patch) | |
| tree | c580800a742a8c3489e2409b88d77d3fb0261780 /usr.sbin | |
| parent | 7f42da4b1592751ca47a859d7188cfef1c35d98d (diff) | |
don't include firmwares in the fuzzy auto-reinstall list
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgInfo.pm | 6 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_info.1 | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm index 3d4a9bc4ab7..4b5e1e76132 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.40 2016/06/28 17:35:34 espie Exp $ +# $OpenBSD: PkgInfo.pm,v 1.41 2016/07/27 12:58:21 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -417,6 +417,10 @@ sub print_info my $plist; if ($state->opt('z')) { $plist = $handle->plist(\&OpenBSD::PackingList::ExtraInfoOnly); + # firmware don't belong + if ($plist->has('firmware')) { + return; + } my $name = OpenBSD::PackageName->new_from_string($plist->pkgname); my $stem = $name->{stem}; my $compose = $stem."--".join('-', sort keys %{$name->{flavors}}); diff --git a/usr.sbin/pkg_add/pkg_info.1 b/usr.sbin/pkg_add/pkg_info.1 index f6d480e3e79..954a369f8ca 100644 --- a/usr.sbin/pkg_add/pkg_info.1 +++ b/usr.sbin/pkg_add/pkg_info.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_info.1,v 1.53 2016/06/28 15:38:36 espie Exp $ +.\" $OpenBSD: pkg_info.1,v 1.54 2016/07/27 12:58:21 espie Exp $ .\" .\" Documentation and design originally from FreeBSD. All the code has .\" been rewritten since. We keep the documentation's notice: @@ -15,7 +15,7 @@ .\" Jordan K. Hubbard .\" .\" -.Dd $Mdocdate: June 28 2016 $ +.Dd $Mdocdate: July 27 2016 $ .Dt PKG_INFO 1 .Os .Sh NAME @@ -187,6 +187,9 @@ To be reused with .Xr pkg_add 1 .Fl l to recreate a package installation with different versions and no ambiguity. +Note that this intentionally does not include firmwares, as they are not +handled by +.Xr pkg_add 1 . .El .Sh ENVIRONMENT .Bl -tag -width PKG_TMPDIR |