Changeset 223 in ProjectBuilder

Timestamp:

Oct 17, 2007, 11:32:14 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Use halt instead of poweroff unavailable on suse ut seems
• die when no VM file found

Location:

0.8.5

Files:

• pb/bin/pb (modified) (3 diffs)
• pbconf/project-builder/pbfilter/suse.pbf (modified) (1 diff)

0.8.5/pb/bin/pb

@@ -567 +567 @@
         pb_system("ssh -q -p $port $mac \"rm -rf $tdir $bdir\"","VM cleanup on $mac");
         if (! $vmexist) {
-            pb_system("ssh -q -p $port $mac \"sudo /usr/bin/poweroff \"; 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 $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_send2ssh("Packages","$odir"."_"."$over");
@@ -636 +636 @@
         $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$vm.qemu";
         if (! -f "$vmm") {
-            print "Unable to find VM $vmm";
-            return;
+            die "Unable to find VM $vmm";
         }
         $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$vmport->{$ENV{'PBPROJ'}}:10.0.2.15:22 $vmm"
@@ -674 +673 @@
     print SCRIPT "mv .pbrc \$HOME\n";
     print SCRIPT "cd ..\n";
+    # Force new date to be i nthe future compared to the date of the tar file
+    my @date=(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
     my $upddate = strftime("%m%d%H%M%Y", @date);
     print SCRIPT "echo Setting up date on $vmntp...\n";

0.8.5/pbconf/project-builder/pbfilter/suse.pbf

@@ -4 +4 @@
 # Filter for suse build
 #
-
 # PBGRP is replaced by the RPM group of apps
 filter PBGRP = Applications/Archiving