From b66af3de165953fb15a8295a528202db665f484e Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Sun, 29 Apr 2007 11:29:00 +0000
Subject: make packing-lists more regular by including the CONTENTS. Avoid
 `recursion' by not writing it out. also remove PackingList::write, since it's
 a simple visitor.

---
 usr.sbin/pkg_add/OpenBSD/PackingElement.pm |  5 ++++-
 usr.sbin/pkg_add/OpenBSD/PackingList.pm    | 11 +----------
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'usr.sbin/pkg_add')

diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index fac30909866..f200725cb73 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.88 2007/04/15 10:17:29 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.89 2007/04/29 11:28:59 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -1243,6 +1243,9 @@ sub write
 package OpenBSD::PackingElement::FCONTENTS;
 our @ISA=qw(OpenBSD::PackingElement::SpecialFile);
 sub category() { OpenBSD::PackageInfo::CONTENTS }
+# XXX we don't write `self'
+sub write
+{}
 
 package OpenBSD::PackingElement::FMODULE;
 our @ISA=qw(OpenBSD::PackingElement::SpecialFile);
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm
index e81801e186a..0422cc0d11f 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.56 2007/04/29 10:52:15 espie Exp $
+# $OpenBSD: PackingList.pm,v 1.57 2007/04/29 11:28:59 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -247,15 +247,6 @@ MAINLOOP:
 	}
 }
 
-sub write
-{
-	my ($self, $fh) = @_;
-
-	$self->visit('write', $fh);
-
-}
-
-
 sub fromfile
 {
 	my ($a, $fname, $code) = @_;
-- 
cgit v1.2.3