equal
deleted
inserted
replaced
62 warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst}; |
62 warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst}; |
63 $pkgDef = "$package->{dst}/$package->{sysdef}"; |
63 $pkgDef = "$package->{dst}/$package->{sysdef}"; |
64 } |
64 } |
65 die "Unable to locate any package_definition at all for $package->{dst}" unless -f $pkgDef; |
65 die "Unable to locate any package_definition at all for $package->{dst}" unless -f $pkgDef; |
66 |
66 |
|
67 warn "Including $pkgDef for $package->{dst}\n"; |
67 my $pkgTree = eval { $parser->parsefile($pkgDef) } or die "Failed to parse $pkgDef : $@"; |
68 my $pkgTree = eval { $parser->parsefile($pkgDef) } or die "Failed to parse $pkgDef : $@"; |
68 if (!$outTree) |
69 if (!$outTree) |
69 { |
70 { |
70 # The first file is taken verbatim |
71 # The first file is taken verbatim |
71 $outTree = $pkgTree; |
72 $outTree = $pkgTree; |