Skip to content

Commit

Permalink
fix build of "x11/qt3," : for multi-packages, when we find the default
Browse files Browse the repository at this point in the history
subpackage, copy full options status. So, e.g., look for "x11/qt3,"
find "x11/qt3,,-main" and equate it with "x11/qt3," NOT "x11/qt3"
  • Loading branch information
marcespie committed Sep 27, 2011
1 parent 8cc7b2d commit 1f696b0
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions infrastructure/lib/DPB/PkgPath.pm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: PkgPath.pm,v 1.10 2011/06/15 10:09:31 espie Exp $
# $OpenBSD: PkgPath.pm,v 1.11 2011/09/27 17:15:03 espie Exp $
#
# Copyright (c) 2010 Marc Espie <[email protected]>
#
Expand Down Expand Up @@ -189,6 +189,7 @@ sub zap_default
return $self unless defined $subpackage;
if ($subpackage->string eq $self->{multi}) {
my $o = bless {pkgpath => $self->{pkgpath},
sawflavor => $self->{sawflavor},
flavors => $self->copy_flavors}, ref($self);
return $o->normalize;
} else {
Expand All @@ -202,7 +203,7 @@ sub handle_default
my ($self, $h) = @_;
my $m = $self->zap_default($self->{info}->{SUBPACKAGE});
if ($m ne $self) {
#print $m->fullpkgpath, " vs. ", $self->fullpkgpath,"\n";
# print $m->fullpkgpath, " vs. ", $self->fullpkgpath,"\n";
$m->{info} = $self->{info};
$h->{$m} = $m;
}
Expand Down

0 comments on commit 1f696b0

Please sign in to comment.