Changeset 2333 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder
- Timestamp:
- Oct 24, 2017, 12:49:59 AM (7 years ago)
- Location:
- devel/pb-modules/lib/ProjectBuilder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r2330 r2333 206 206 # 3: Should have the same keys as the previous one. If ambiguity, which other distributions should be checked 207 207 # 4: Matching Rg. Expr to detect distribution and version 208 my ($single_rel_files, $ambiguous_rel_files,$distro_similar,$distro_match ) = pb_conf_get("osrelfile","osrelambfile","osambiguous","osrelexpr");208 my ($single_rel_files, $ambiguous_rel_files,$distro_similar,$distro_match,$nover) = pb_conf_get("osrelfile","osrelambfile","osambiguous","osrelexpr","osnover"); 209 209 210 210 my $release; … … 226 226 ($release) = $tmp =~ m/$distro_match->{$d}/m; 227 227 } else { 228 print STDERR "Unable to find $d version in $r (non-ambiguous)\n"; 229 print STDERR "Please report to the maintainer bruno_at_project-builder.org\n"; 228 if (not defined ($nover->{$d})) { 229 print STDERR "Unable to find $d version in $r (non-ambiguous)\n"; 230 print STDERR "Please report to the maintainer bruno_at_project-builder.org\n"; 231 } 230 232 $release = "unknown"; 231 233 } … … 410 412 } elsif ($pbos->{'type'} eq "deb") { 411 413 $regexp = '^Build-Depends:(.*)$'; 414 } elsif ($pbos->{'type'} eq "apk") { 415 # TODO 416 $regexp = 'TODO\n'; 412 417 } elsif ($pbos->{'type'} eq "ebuild") { 413 418 $sep = '"'.$/; 414 $regexp = '^DEPEND="(.*)"\n' 419 $regexp = '^DEPEND="(.*)"\n'; 415 420 } else { 416 421 # No idea -
devel/pb-modules/lib/ProjectBuilder/VE.pm
r2317 r2333 255 255 } elsif ($pbos->{'type'} eq "ebuild") { 256 256 die "Please teach the dev team how to build gentoo chroot"; 257 } elsif ($pbos->{'type'} eq "apk") { 258 die "Please teach the dev team how to build alpine chroot"; 257 259 } else { 258 260 die "Unknown distribution type $pbos->{'type'}. Report to dev team";
Note:
See TracChangeset
for help on using the changeset viewer.