Changeset 1953 in ProjectBuilder for devel/pb/bin/pb
- Timestamp:
- Mar 5, 2015, 3:08:50 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/bin/pb
r1952 r1953 2099 2099 chomp($src); 2100 2100 close(KEEP); 2101 $src = "$src $pbscript{$v}";2102 2101 } 2103 2102 if (($cmt eq "Sources") || ($cmt eq "Packages") || ($cmt eq "CPAN")) { … … 2117 2116 } 2118 2117 2119 pb_log(0,"Sources handled ($cmt): $src\n");2120 2118 pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$path,$conf))."\n"); 2121 2119 my ($sshhost,$sshdir) = pb_conf_get($host,$dir); … … 2188 2186 my ($pbrepo) = pb_conf_get("pbrepo"); 2189 2187 2190 # Repository management2188 # Script for Repository management 2191 2189 $pbscript{$v} = "$ENV{'PBBUILDDIR'}/pbscript.$$"; 2190 2191 # That script should be part of the delivery 2192 $src = "$src $pbscript{$v}"; 2192 2193 open(PBS,"> $pbscript{$v}") || die "Unable to create $pbscript{$v}"; 2193 2194 if ($pbos->{'type'} eq "rpm") { … … 2391 2392 } 2392 2393 close(PBS); 2393 chmod 0755, "$ENV{'PBBUILDDIR'}/pbscript.$$";2394 chmod 0755,$pbscript{$v}; 2394 2395 } else { 2395 2396 return; … … 2597 2598 } 2598 2599 2600 pb_log(0,"Sources handled ($cmt): $src\n"); 2599 2601 # For docker everything is done in the Dockerfile 2600 2602 if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep < 3)) { … … 2625 2627 my $pbscript1; 2626 2628 if (($cmt =~ /^(V[EM]|RM)/) || ($cmt =~ /Packages/)){ 2627 $pbscript1 = "$pbscript{$v}";2629 $pbscript1 = $pbscript{$v}; 2628 2630 } else { 2629 2631 $pbscript1 = "pbscript"; … … 2645 2647 } elsif (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) { 2646 2648 $dkcmd = "/bin/bash $homedir/$tdir-2/".basename($pbscript1); 2647 #$dkcmd .= "/bin/bash $homedir/$tdir-2/".basename($pbscript1)." ; if [ '$pbkeep' == '0' ]; then rm -f $pbscript1; fi ; ";2648 2649 } else { 2649 2650 my $s = basename($pbscript1); … … 2725 2726 print KEEP "$made\n"; 2726 2727 close(KEEP); 2727 if (($ vetype eq "docker") && ($pbstep >= 3)) {2728 if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) { 2728 2729 pb_rm_rf("$cp2target"); 2729 2730 pb_system("$cmd1 rm $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-$cmt","","quiet");
Note:
See TracChangeset
for help on using the changeset viewer.