cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle copying stuff out-of-normal prefix over.

Browse Source 
also, newauth and newgroup are now tagging along with CVSTag, so we don't
need to copy them twice.
This commit is contained in:
espie 2018-05-04 19:21:14 +00:00
parent 1f0050a7fc
commit ca26b25646
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
infrastructure/bin/update-plist
View File

@ -1,5 +1,5 @@
#! /usr/bin/perl
# $OpenBSD: update-plist,v 1.89 2018/05/04 18:57:35 espie Exp $
# $OpenBSD: update-plist,v 1.90 2018/05/04 19:21:14 espie Exp $
# Copyright (c) 2018 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -541,6 +541,20 @@ sub show_unknown
}
}
sub copy_with_tags
{
my ($self, $plist) = @_;
$self->{found} = 1;
$self->add_object($plist);
if (defined $self->{mytags}) {
for my $tag (@{$self->{mytags}}) {
$tag->add_object($plist);
$tag->{found} = 1;
}
}
}
package OpenBSD::PackingElement::State;
# that stuff NEVER gets copied over, but interpolated from existing objects
@ -649,14 +663,7 @@ package OpenBSD::PackingElement::CVSTag;
sub copy_annotations
{
my ($self, $plist) = @_;
$self->{found} = 1;
$self->clone->add_object($plist);
if (defined $self->{mytags}) {
for my $tag (@{$self->{mytags}}) {
$tag->add_object($plist);
$tag->{found} = 1;
}
}
$self->copy_with_tags($plist);
}
sub find_existing_cvstags
@ -672,12 +679,6 @@ sub tie_objects
$plist->{state}{lastobject} = $self;
}
package OpenBSD::PackingElement::NewAuth;
sub copy_annotations
{
&OpenBSD::PackingElement::Meta::copy_annotations;
}
# these are not really in the plist on disk!
package OpenBSD::PackingElement::Name;
sub copy_annotations
@ -934,9 +935,6 @@ sub copy_extra
{
my ($self, $plist) = @_;
if ($self->name !~ /^\// && $self->cwd ne $plist->{state}->cwd) {
OpenBSD::PackingElement::Cwd->add($plist, $self->cwd);
}
$self->{found} = 1;
$self->clone->add_object($plist);
}
@ -989,18 +987,17 @@ sub copy_from_old
$rebless = 0;
}
}
# XXX this should be safe for all our objects
bless $e, $o->element_class if $rebless;
# TODO we need to check the actual cwd here, so that stuff outside
# the prefix gets added reaaaallly late
$e->add_object($s->nlist);
if (defined $e->{mytags}) {
for my $tag (@{$e->{mytags}}) {
$tag->add_object($s->nlist);
$tag->{found} = 1;
}
# mark it for later
if ($e->cwd ne $s->{state}{prefix}) {
push(@{$s->{badcwd}}, $e);
return;
}
$e->copy_with_tags($s->nlist);
}
sub copy_existing
@ -1145,6 +1142,18 @@ for my $i (1, 2) {
}
}
# now we can handle stuff outside of cwd, if needed
for my $p (@lists) {
my $cwd = $p->{state}{prefix};
for my $e (@{$p->{badcwd}}) {
if ($e->cwd ne $cwd) {
$cwd = $e->cwd;
OpenBSD::PackingElement::Cwd->add($p->nlist, $cwd);
}
$e->copy_with_tags($p->nlist);
}
}
# so we read everything, let's figure out common directories
my $cache = {};
my $portsdir = $ENV{PORTSDIR};