diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-05-28 11:35:55 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-05-28 11:35:55 +0000 |
| commit | 00e2d92308667f69d755cd046bb4d67cd778441a (patch) | |
| tree | 3358a673531ce51aced756fb0a37252aab065f10 /usr.sbin | |
| parent | 8f7923dacf375429e8de621377dc47bbd9b31caf (diff) | |
always create packing-lists with a `contents' entry.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingList.pm | 8 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_create | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm index decec66ad93..11f55da536f 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingList.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingList.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingList.pm,v 1.65 2007/05/24 11:06:29 espie Exp $ +# $OpenBSD: PackingList.pm,v 1.66 2007/05/28 11:35:54 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -53,9 +53,9 @@ use OpenBSD::PackageInfo; sub new { my $class = shift; - bless {state => - OpenBSD::PackingList::State->new - }, $class; + my $plist = bless {state => OpenBSD::PackingList::State->new }, $class; + OpenBSD::PackingElement::File->add($plist, CONTENTS); + return $plist; } sub read diff --git a/usr.sbin/pkg_add/pkg_create b/usr.sbin/pkg_add/pkg_create index 4ee39f8b66c..c9ca7980961 100644 --- a/usr.sbin/pkg_add/pkg_create +++ b/usr.sbin/pkg_add/pkg_create @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_create,v 1.102 2007/05/25 12:19:23 espie Exp $ +# $OpenBSD: pkg_create,v 1.103 2007/05/28 11:35:54 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -476,7 +476,6 @@ set_usage( '[-U undisplayfile] [-W wantedlib] -c desc -d desc -f packinglist pkg-name'); my $plist = new OpenBSD::PackingList; -OpenBSD::PackingElement::File->add($plist, CONTENTS); try { getopts('p:f:c:d:vi:k:r:m:M:U:S:hs:OA:L:B:D:P:W:nqQ', {'D' => |