diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-11-11 11:16:41 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-11-11 11:16:41 +0000 |
| commit | 9a75ae2f447ba6fc84c5a0ec8444cdc0b3a650f0 (patch) | |
| tree | f4d68f8f40fbe180d0eaceed7376127491ada8f4 /usr.sbin/pkg_add/pkg_info | |
| parent | e31ed5bb4cbddf2694888868ba2244110075a89c (diff) | |
introduce shortcuts to read/write contents from_installation/to_installation
use these to simplify all those packing lists manipulations.
demote non-root detection to a warning in -n mode:
fix a couple of minor bugs, of stuff that was run in -n mode and should not.
Namely, manpages were indexed/unindexed (ouch) and tempfiles were creating
during updates.
Diffstat (limited to 'usr.sbin/pkg_add/pkg_info')
| -rw-r--r-- | usr.sbin/pkg_add/pkg_info | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/pkg_info b/usr.sbin/pkg_add/pkg_info index 821855ed1ad..1cace9e325f 100644 --- a/usr.sbin/pkg_add/pkg_info +++ b/usr.sbin/pkg_add/pkg_info @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_info,v 1.14 2004/11/10 09:55:43 espie Exp $ +# $OpenBSD: pkg_info,v 1.15 2004/11/11 11:16:39 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -68,7 +68,8 @@ sub find_by_path $all_plists = []; for my $pkg (installed_packages()) { push(@$all_plists, - OpenBSD::PackingList->fromfile(installed_info($pkg).CONTENTS, \&OpenBSD::PackingList::ExtraInfoOnly)); + OpenBSD::PackingList->from_installation($pkg, + \&OpenBSD::PackingList::ExtraInfoOnly); } } my @result = (); |