Changeset 1530 in ProjectBuilder
- Timestamp:
- May 12, 2012, 3:36:08 AM (12 years ago)
- Location:
- devel/pb-modules
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/etc/pb.conf
r1528 r1530 288 288 # Should be in sync wirh regular expressions from osrelexpr upper 289 289 #osuseminorrel rhel = true 290 osuseminorrel default = false 290 291 291 292 # These deps are needed before setupvm|ve can be run. -
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r1529 r1530 134 134 # Dig into the tuple to find the best answer 135 135 # Do NOT factorize here, as it won't work as of now for hash creation 136 # Do NOT change order without caution 137 $pbos->{'useminor'} = pb_distro_get_param($pbos,pb_conf_get("osuseminorrel")); 136 138 $pbos->{'family'} = pb_distro_get_param($pbos,pb_conf_get("osfamily")); 137 139 $pbos->{'type'} = pb_distro_get_param($pbos,pb_conf_get("ostype")); 138 ($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'} ,$pbos->{'useminor'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd","osuseminorrel"));140 ($pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("os","osins","ossuffix","osnover","osremovedotinver","osupd")); 139 141 #($pbos->{'family'},$pbos->{'type'},$pbos->{'os'},$pbos->{'install'},$pbos->{'suffix'},$pbos->{'nover'},$pbos->{'rmdot'},$pbos->{'update'}) = pb_distro_get_param($pbos,pb_conf_get("osfamily","ostype","os","osins","ossuffix","osnover","osremovedotinver","osupd")); 140 142 … … 454 456 $ok = 1 if /^ii\s+$p/; 455 457 } 458 close(CMD); 456 459 next if $ok; 457 460 pb_log(1, "INFO: missing dependency $p\n"); … … 620 623 # Loop to include also previous minor versions 621 624 # if configured so 622 if (( $pbos->{'useminor'} eq "true") && ($pbos->{version} =~ /^(\d+)\.(\d+)$/o)) {625 if ((defined $pbos->{'useminor'}) && ($pbos->{'useminor'} eq "true") && ($pbos->{'version'} =~ /^(\d+)\.(\d+)$/o)) { 623 626 my ($major, $minor) = ($1, $2); 624 627 while ($minor > 0) { 625 628 $minor--; 626 push (@keylist, "$pbos->{ name}-${major}.$minor");629 push (@keylist, "$pbos->{'name'}-${major}.$minor"); 627 630 } 628 push (@keylist, "$pbos->{ name}-$major");629 } 630 631 push (@keylist, $pbos->{ name}, $pbos->{family}, $pbos->{type}, $pbos->{os}, $generic);631 push (@keylist, "$pbos->{'name'}-$major"); 632 } 633 634 push (@keylist, $pbos->{'name'}, $pbos->{'family'}, $pbos->{'type'}, $pbos->{'os'}, $generic); 632 635 return @keylist; 633 636 } -
devel/pb-modules/lib/ProjectBuilder/VE.pm
r1528 r1530 100 100 foreach my $proxy (qw/http_proxy ftp_proxy/) { 101 101 if (defined $ENV{$proxy}) { 102 open( <CMD>,"sudo sh -c 'echo \$$proxy' |") or die "can't run sudo sh?: $!";102 open(CMD,"sudo sh -c 'echo \$$proxy' |") or die "can't run sudo sh?: $!"; 103 103 $_ = <CMD>; 104 104 chomp(); 105 105 die "sudo not passing through env var $proxy; '$ENV{$proxy}' != '$_'\nAdd line Defaults:`whoami` env_keep += \"$proxy\" to sudoers file?" unless $_ eq $ENV{$proxy}; 106 close(CMD); 106 107 } 107 108 } 109 } 108 110 # Handle cross arch on Intel based platforms 109 111 $sudocmd = "setarch i386 $sudocmd" if (($pbos->{arch} =~ /i?86/) && ($arch eq 'x86_64'));
Note:
See TracChangeset
for help on using the changeset viewer.