Changeset 483 in ProjectBuilder

Timestamp:

Jun 6, 2008, 12:24:17 AM (16 years ago)

Author:

Bruno Cornec

Message:

Fix #27

File:

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

devel/pb/bin/pb

@@ -685 +685 @@
             foreach my $f (@specfile) {
                 if ($f =~ /\.spec$/) {
-                    pb_system("rpmbuild $specialdef --define \'packager $ENV{'PBPACKAGER'}\' --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}");
+                    pb_system("rpmbuild $specialdef --define \'packager $ENV{'PBPACKAGER'}\' --define \"_topdir $ENV{'PBBUILDDIR'}\" -ba $f","Building package with $f under $ENV{'PBBUILDDIR'}","verbose");
                     last;
                 }
@@ -1145 +1145 @@
             $ENV{'PBVMOPT'} = "";
         }
-        if (defined $vmopt->{$ENV{'PBPROJ'}}) {
+        # Set a default timeout of 2 minutes
+        if (not defined $ENV{'PBVMTMOUT'}) {
+            $ENV{'PBVMTMOUT'} = "120";
+        }
+        if (defined $vmopt->{$v}) {
+            $ENV{'PBVMOPT'} .= " $vmopt->{$v}" if ($ENV{'PBVMOPT'} !~ / $vmopt->{$v}/);
+        } elsif (defined $vmopt->{$ENV{'PBPROJ'}}) {
             $ENV{'PBVMOPT'} .= " $vmopt->{$ENV{'PBPROJ'}}" if ($ENV{'PBVMOPT'} !~ / $vmopt->{$ENV{'PBPROJ'}}/);
+        }
+        if (defined $vmtmout->{$v}) {
+            $ENV{'PBVMTMOUT'} = $vmtmout->{$v};
+        } elsif (defined $vmtmout->{$ENV{'PBPROJ'}}) {
+            $ENV{'PBVMTMOUT'} = $vmtmout->{$ENV{'PBPROJ'}};
         }
         my $nport = $vmport->{$ENV{'PBPROJ'}};
@@ -1194 +1205 @@
             } else {
                 pb_system("$cmd &","Launching the VM $vmm");
-                pb_system("sleep $vmtmout->{$ENV{'PBPROJ'}}","Waiting for VM $v to come up");
+                pb_system("sleep $ENV{'PBVMTMOUT'}","Waiting $ENV{'PBVMTMOUT'} s for VM $v to come up");
                 $vmpid = pb_check_ps($tmpcmd,$vmm);
                 pb_log(0,"VM $vmm launched (pid $vmpid)\n");
@@ -1321 +1332 @@
         die "Only SVN is supported at the moment";
     }
+
     my $res = pb_cms_isdiff($scheme,$ENV{'PBROOTDIR'});
     die "ERROR: No differences accepted in CMS for $ENV{'PBROOTDIR'} before creating a new version" if ($res != 0);