Changeset 239 in ProjectBuilder for devel/pb

Timestamp:

Oct 22, 2007, 4:01:27 PM (18 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix port issues with VM
Some debian build fixes

File:

• devel/pb/bin/pb (modified) (6 diffs)

devel/pb/bin/pb

@@ -292 +292 @@
             }
         }
-        print "$liste have been filtered\n";
+        print $LOG "Files ".$liste."have been filtered\n";
 
         # Archive dest dir
@@ -534 +534 @@
     # Overwrite account value if passed as parameter
     $mac = "$pbaccount\@$sshhost->{$ENV{'PBPROJ'}}" if (defined $pbaccount);
-    $port = "$pbport" if (defined $pbport);
     my $tdir;
     my $bdir;
@@ -549 +548 @@
         return;
     }
+    my $nport = $sshport->{$ENV{'PBPROJ'}};
+    $nport = "$pbport" if (defined $pbport);
+
     # Remove a potential $ENV{'HOME'} as tdir should be relative to pb's home
     $tdir =~ s|\$ENV.+\}/||;
 
-    $port = $sshport->{$ENV{'PBPROJ'}};
     my $tm = $vmtmout->{$ENV{'PBPROJ'}};
-    pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $mac");
-    pb_system("cd $ENV{'PBBUILDDIR'} ; scp -p -P $port $src $mac:$tdir 2> /dev/null","$cmt delivery in $tdir on $mac");
-    pb_system("ssh -q -p $port $mac \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");
+    pb_system("ssh -q -p $nport $mac \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $mac");
+    pb_system("cd $ENV{'PBBUILDDIR'} ; scp -p -P $nport $src $mac:$tdir 2> /dev/null","$cmt delivery in $tdir on $mac");
+    pb_system("ssh -q -p $nport $mac \"echo \'cd $tdir ; if [ -f pbscript ]; then ./pbscript; fi\' | bash\"","Executing pbscript on $mac  if needed");
     if ($cmt eq "VMs") {
         # Get back info on pkg produced, compute their name and get them from the VM
-        pb_system("scp -p -P $port $mac:$bdir/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'} 2> /dev/null","Get package names in $bdir on $mac");
+        pb_system("scp -p -P $nport $mac:$bdir/pbgen-$pbprojver-$pbprojtag $ENV{'PBBUILDDIR'} 2> /dev/null","Get package names in $bdir on $mac");
         open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$pbprojver-$pbprojtag";
         my $src = <KEEP>;
@@ -571 +572 @@
         foreach my $p (split(/ +/,$src)) {
             my $j = basename($p);
-            pb_system("scp -p -P $port $mac:\'$bdir/$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Package recovery of $j in $bdir from $mac");
+            pb_system("scp -p -P $nport $mac:\'$bdir/$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Package recovery of $j in $bdir from $mac");
             $made="$made $odir/$over/$j" if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
         }
         print KEEP "$made\n";
         close(KEEP);
-        pb_system("ssh -q -p $port $mac \"rm -rf $tdir $bdir\"","VM cleanup on $mac");
+        pb_system("ssh -q -p $nport $mac \"rm -rf $tdir $bdir\"","VM cleanup on $mac");
         if (! $vmexist) {
-            pb_system("ssh -q -p $port $mac \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $vm halt (pid $vmpid)");
+            pb_system("ssh -q -p $nport $mac \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $vm halt (pid $vmpid)");
         }
         pb_send2ssh("Packages","$odir"."_"."$over");
@@ -623 +624 @@
         $ENV{'PBVMOPT'} = "";
     }
-    $vmport->{$ENV{'PBPROJ'}} = "$pbport" if (defined $pbport);
+    my $nport = $vmport->{$ENV{'PBPROJ'}};
+    $nport = "$pbport" if (defined $pbport);
 
     my $cmd;
@@ -649 +651 @@
             die "Unable to find VM $vmm";
         }
-        $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$vmport->{$ENV{'PBPROJ'}}:10.0.2.15:22 $vmm"
+        $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
     } elsif ($vmtype eq "xen") {
     } elsif ($vmtype eq "vmware") {