Changeset 355 in ProjectBuilder for devel/pb

Timestamp:

Apr 6, 2008, 2:29:09 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix a problem in build2vm where the new name of the distro wasn't correctly handled when trying to get packages pushed to the ftp server.

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• lib/ProjectBuilder/Base.pm (modified) (4 diffs)

devel/pb/bin/pb

@@ -848 +848 @@
 
     pb_log(0,"Sources handled ($cmt): $src\n");
+    pb_log(2,"values: ".Dumper(($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf))."\n");
     my ($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf) = pb_conf_get($host,$login,$dir,$port,$tmout,$rebuild,$path,$conf);
     pb_log(2,"ssh: ".Dumper(($sshhost,$sshlogin,$sshdir,$sshport,$vtmout,$vrebuild,$vepath,$veconf))."\n");
@@ -859 +860 @@
         # Overwrite account value if passed as parameter
         $mac = "$pbaccount\@$sshhost->{$ENV{'PBPROJ'}}" if (defined $pbaccount);
+        pb_log(2, "DEBUG: pbaccount: $pbaccount => mac: $mac\n") if (defined $pbaccount);
     }
 
@@ -938 +940 @@
         close(KEEP);
         pb_system("$shcmd \"rm -rf $tdir $bdir\"","$cmt cleanup");
-        pb_send2target("Packages","$odir"."_"."$over");
+
+        # We want to send them to the ssh account so overwrite what has been done before
+        undef $pbaccount;
+        pb_send2target("Packages",$odir."-".$over."-".$oarch,$vmexist,$vmpid);
         if ((! $vmexist) && ($cmt eq "vm")) {
             pb_system("$shcmd \"sudo /sbin/halt -p \"; sleep $tm ; echo \'if [ -d /proc/$vmpid ]; then kill -9 $vmpid; fi \' | bash ; sleep 10","VM $v halt (pid $vmpid)");

devel/pb/lib/ProjectBuilder/Base.pm

@@ -34 +34 @@
 our @EXPORT = qw(pb_env_init pb_conf_read pb_conf_read_if pb_conf_get pb_conf_get_if pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_filter_file_inplace pb_cms_export pb_cms_log pb_cms_isdiff pb_cms_copy pb_cms_checkout pb_get_date pb_log pb_log_init pb_get_pkg pb_cms_get_pkg pb_get_uri pb_cms_get_uri $debug $LOG);
 
-$ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
-
 sub pb_env_init {
 
@@ -43 +41 @@
 my $ver;
 my $tag;
+
+$ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
 
 #
@@ -910 +910 @@
 my $p2;
 
-pb_log(2,"DEBUG: param1: ".Dumper(@ptr1)."\n");
-pb_log(2,"DEBUG: param2: ".Dumper(@ptr2)."\n");
+pb_log(2,"DEBUG: pb_conf_get param1: ".Dumper(@ptr1)."\n");
+pb_log(2,"DEBUG: pb_conf_get param2: ".Dumper(@ptr2)."\n");
 
 foreach my $i (0..$#param) {
@@ -950 +950 @@
     }
     $ptr1[$i] = $p1;
-    pb_log(2,"DEBUG: param ptr1: ".Dumper(@ptr1)."\n");
-}
+}
+pb_log(2,"DEBUG: pb_conf_get param ptr1: ".Dumper(@ptr1)."\n");
 return(@ptr1);
 }