summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2004-10-05 10:09:35 +0000
committerMarc Espie <espie@cvs.openbsd.org>2004-10-05 10:09:35 +0000
commit587f1037016de8b1054081650ac04da2b82c6040 (patch)
treed2ac6181d37554fa4482dfedd9a2172428b32a03
parent04ad1f8b1fc145db4c26adc3dcee861802304452 (diff)
fullname and mode stuff only concerns ::Object
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PackingElement.pm44
1 files changed, 22 insertions, 22 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index 58027a54945..fe24acb2784 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.35 2004/10/05 10:06:14 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.36 2004/10/05 10:09:34 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -131,6 +131,22 @@ sub stringize($)
return $_[0]->{name};
}
+sub IsFile() { 0 }
+
+sub NoDuplicateNames() { 0 }
+
+# Basic class hierarchy
+
+# various stuff that's only linked to objects before/after them
+# this class doesn't have real objects: no valid new nor clone...
+package OpenBSD::PackingElement::Annotation;
+our @ISA=qw(OpenBSD::PackingElement);
+sub new { die "Can't create annotation objects" }
+
+# concrete objects
+package OpenBSD::PackingElement::Object;
+our @ISA=qw(OpenBSD::PackingElement);
+
sub compute_fullname
{
my ($self, $state, $absolute_okay) = @_;
@@ -149,6 +165,11 @@ sub compute_fullname
return $fullname;
}
+sub fullname($)
+{
+ return $_[0]->{fullname};
+}
+
sub compute_modes
{
my ($self, $state) = @_;
@@ -185,27 +206,6 @@ sub expand
}
return $_;
}
-sub IsFile() { 0 }
-
-sub NoDuplicateNames() { 0 }
-
-sub fullname($)
-{
- return $_[0]->{fullname};
-}
-
-# Basic class hierarchy
-
-# various stuff that's only linked to objects before/after them
-# this class doesn't have real objects: no valid new nor clone...
-package OpenBSD::PackingElement::Annotation;
-our @ISA=qw(OpenBSD::PackingElement);
-sub new { die "Can't create annotation objects" }
-
-# concrete objects
-package OpenBSD::PackingElement::Object;
-our @ISA=qw(OpenBSD::PackingElement);
-
# concrete objects with file-like behavior
package OpenBSD::PackingElement::FileObject;
our @ISA=qw(OpenBSD::PackingElement::Object);