Changeset 987 in ProjectBuilder for devel/pb/bin/pb
- Timestamp:
- Feb 23, 2010, 8:21:51 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r986 r987 1157 1157 my $port = "sshport"; 1158 1158 my $conf = "sshconf"; 1159 my $rebuild = "sshrebuild";1160 1159 my $tmout = undef; 1161 1160 my $path = undef; … … 1163 1162 $login = "vmlogin"; 1164 1163 $dir = "pbdefdir"; 1165 $rebuild = "vmrebuild";1166 1164 # Specific VM 1167 1165 $tmout = "vmtmout"; … … 1175 1173 $path = "vepath"; 1176 1174 $conf = "rbsconf"; 1177 $rebuild = "verebuild";1178 1175 } elsif ($cmt eq "Web") { 1179 1176 $host = "websshhost"; … … 1249 1246 1250 1247 pb_log(0,"Sources handled ($cmt): $src\n"); 1251 pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$ rebuild,$path,$conf))."\n");1248 pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$path,$conf))."\n"); 1252 1249 my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port); 1253 1250 # Not mandatory... 1254 my ($ vrebuild,$rbsconf,$testver) = pb_conf_get_if($rebuild,$conf,"testver");1251 my ($rbsconf,$testver) = pb_conf_get_if($conf,"testver"); 1255 1252 my ($vtmout,$vepath); 1256 1253 # ...Except those in virtual context … … 1261 1258 ($vtmout) = pb_conf_get($tmout); 1262 1259 } 1263 pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$v rebuild,$vepath,$rbsconf))."\n");1260 pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vepath,$rbsconf))."\n"); 1264 1261 1265 1262 my $mac; … … 1742 1739 1743 1740 # Get VE context 1744 my ($ptr,$vetmout,$vepath,$ verebuild,$rbsconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","rbsconf");1741 my ($ptr,$vetmout,$vepath,$rbsconf) = pb_conf_get("vetype","vetmout","vepath","rbsconf"); 1745 1742 my $vetype = $ptr->{$ENV{'PBPROJ'}}; 1746 1743 1747 1744 # We can probably only get those params now we have the distro context 1748 my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$ vepkglist,$osmindep) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","vepkglist","osmindep");1745 my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild"); 1749 1746 1750 1747 if (($vetype eq "chroot") || ($vetype eq "schroot")) { … … 1755 1752 1756 1753 my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype"); 1757 if (($create != 0) || ( $verebuild->{$ENV{'PBPROJ'}} =~ /true/i) || ($pbforce == 1)) {1754 if (($create != 0) || ((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) { 1758 1755 # We have to rebuild the chroot 1759 1756 if ($dtype eq "rpm") { … … 1775 1772 $postparam = ""; 1776 1773 $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep); 1777 $postparam .= ","; 1778 $postparam .= pb_distro_get_param($ddir,$dver,$darch,$vepkglist); 1779 if ($postparam eq ",") { 1774 if ($postparam eq "") { 1780 1775 $addpkgs = ""; 1781 1776 } else { … … 1810 1805 my $addpkgs; 1811 1806 $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep); 1812 $postparam .= ","; 1813 $postparam .= pb_distro_get_param($ddir,$dver,$darch,$vepkglist); 1814 if ($postparam eq ",") { 1807 if ($postparam eq "") { 1815 1808 $addpkgs = ""; 1816 1809 } else { … … 2225 2218 # once this is done, we can do what we want on the VM remotely 2226 2219 } elsif ($vtype eq "ve") { 2227 # We need to finish the setup of packages needed in the VE if needed2220 # We need to finish the setup of packages needed in the VE 2228 2221 # rinse/debootstrap at least needs it 2229 my ($ve pkglist,$osmindep) = pb_conf_get_if("vepkglist","osmindep");2222 my ($vemindep) = pb_conf_get_if("vemindep"); 2230 2223 2231 2224 my $postparam = ""; 2232 if (defined $osmindep) { 2233 $postparam .= pb_distro_get_param($ddir,$dver,$darch,$osmindep); 2234 } 2235 if (defined $vepkglist) { 2236 $postparam .= " ".pb_distro_get_param($ddir,$dver,$darch,$vepkglist); 2225 if (defined $vemindep) { 2226 $postparam .= " ".pb_distro_get_param($ddir,$dver,$darch,$vemindep); 2237 2227 } 2238 2228 # Change the list of pkg in to a space separated list
Note:
See TracChangeset
for help on using the changeset viewer.