From 57273c051afe2cfd0b7f13f0f43e738ae9e4c349 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 28 Oct 2008 12:07:23 +0000
Subject: [PATCH] oops.

---
 infrastructure/install/make-plist | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/infrastructure/install/make-plist b/infrastructure/install/make-plist
index 9c2b07142f3..5bdf4e7dbcb 100755
--- a/infrastructure/install/make-plist
+++ b/infrastructure/install/make-plist
@@ -1,5 +1,5 @@
 #! /usr/bin/perl
-# $OpenBSD: make-plist,v 1.112 2008/10/28 11:59:12 espie Exp $
+# $OpenBSD: make-plist,v 1.113 2008/10/28 12:07:23 espie Exp $
 # Copyright (c) 2004-2008 Marc Espie <espie@openbsd.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -420,7 +420,7 @@ sub add_to_mtree
 {
 	my ($self, $mtree) = @_;
 
-	$mtree->{$self->fullname()} = 1;
+	$mtree->{$self->fullname} = 1;
 }
 
 package OpenBSD::PackingElement::Comment;
@@ -477,9 +477,7 @@ sub augment_mtree
 {
 	my ($mtree, $fh) = @_;
 	my $plist = OpenBSD::PackingList->read($fh, \&OpenBSD::PackingList::DirrmOnly) or die "couldn't read packing-list\n";
-	for my $item (@{$plist->{items}}) {
-		$item->add_to_mtree($mtree);
-	}
+	$plist->add_to_mtree($mtree);
 }
 
 # full file name to file name in plist context
@@ -587,7 +585,7 @@ sub create_object
 {
 	my ($type, $short, $item) = @_;
 
-	if ($item->isa("OpenBSD::PackingElement::Comment")) {
+	if (defined $item && $item->isa("OpenBSD::PackingElement::Comment")) {
 		return OpenBSD::PackingElement::Comment->new($short);
 	}
 	if ($type eq "directory") {