diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2010-05-10 09:17:56 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2010-05-10 09:17:56 +0000 |
commit | 598410cb33a5dae4a9cc9ace47b13645dd15de75 (patch) | |
tree | fb510b8378c93a84533c15a500e8cc37c66a2fff /usr.sbin/pkg_add/OpenBSD/PackingList.pm | |
parent | 0c6b6c722d524ad6a478fc0d2efc5076a4aca479 (diff) |
whitespace fixes
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/PackingList.pm')
-rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingList.pm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingList.pm b/usr.sbin/pkg_add/OpenBSD/PackingList.pm index c314b705314..a9379a51131 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.104 2010/04/19 10:22:59 espie Exp $ +# $OpenBSD: PackingList.pm,v 1.105 2010/05/10 09:17:55 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -24,8 +24,8 @@ my $dot = '.'; sub new { my $class = shift; - bless { default_owner=>'root', - default_group=>'bin', + bless { default_owner=>'root', + default_group=>'bin', default_mode=> 0444, cwd=>\$dot}, $class; } @@ -50,7 +50,7 @@ sub match { my ($h, $plist) = @_; return - defined $plist->fullpkgpath && + defined $plist->fullpkgpath && $h->{$plist->fullpkgpath}; } @@ -133,7 +133,7 @@ sub conflict_list require OpenBSD::PkgCfl; my $self = shift; - + $self->{conflict_list} //= OpenBSD::PkgCfl->make_conflict_list($self); return $self->{conflict_list}; } @@ -330,7 +330,7 @@ MAINLOOP: &$cont($_); while(<$fh>) { redo MAINLOOP unless m/^\@(?:sha|md5|size|symlink|link)\b/o; - m/^\@size\b/o || m/^\@symlink\b/o || + m/^\@size\b/o || m/^\@symlink\b/o || m/^\@link\b/o; &$cont($_); } @@ -452,7 +452,7 @@ sub pkgpath { my $self = shift; if (!defined $self->{_hashpath}) { - my $h = $self->{_hashpath} = + my $h = $self->{_hashpath} = bless {}, "OpenBSD::PackingList::hashpath"; if (defined $self->fullpkgpath) { $h->{$self->fullpkgpath} = 1; @@ -469,7 +469,7 @@ sub pkgpath sub match_pkgpath { my ($self, $plist2) = @_; - return $self->pkgpath->match($plist2) || + return $self->pkgpath->match($plist2) || $plist2->pkgpath->match($self); } @@ -477,12 +477,12 @@ our @unique_categories = (qw(name url digital-signature no-default-conflict manual-installation always-update explicit-update extrainfo localbase arch)); our @list_categories = - (qw(conflict pkgpath incompatibility ask-update updateset depend + (qw(conflict pkgpath incompatibility ask-update updateset depend wantlib define-tag groups users items)); our @cache_categories = (qw(depend wantlib)); - + sub visit { my ($self, $method, @l) = @_; @@ -527,7 +527,7 @@ sub from_installation my $plist = $o->fromfile($filename, $code); if (defined $plist && $code == \&DependOnly) { $plist_cache->{$pkgname} = $plist; - } + } if (defined $plist) { $plist->set_infodir(OpenBSD::PackageInfo::installed_info($pkgname)); } |