Changeset 1070 in ProjectBuilder

Timestamp:

Jul 12, 2010, 7:59:14 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3946@sge91-1-82-234-15-218: bruno | 2010-07-10 15:11:36 +0200

• Fix a bug where some options were passed prefixed with a space and some other postfixed in the usage of PBVMOPT (report from Joachim Langenbach)

File:

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

devel/pb/bin/pb

@@ -1635 +1635 @@
         if ($usesnap == 1) {
             if ((defined $vmsnap->{$v}) && ($vmsnap->{$v} =~ /true/i)) {
-                $ENV{'PBVMOPT'} .= "-snapshot ";
+                $ENV{'PBVMOPT'} .= " -snapshot";
             } elsif ((defined $vmsnap->{$ENV{'PBPROJ'}}) && ($vmsnap->{$ENV{'PBPROJ'}} =~ /true/i)) {
-                $ENV{'PBVMOPT'} .= "-snapshot ";
+                $ENV{'PBVMOPT'} .= " -snapshot";
             } elsif ($pbsnap eq 1) {
-                $ENV{'PBVMOPT'} .= "-snapshot ";
+                $ENV{'PBVMOPT'} .= " -snapshot";
             }
         } 
@@ -1645 +1645 @@
             if (($vmtype eq "kvm") || ($vmtype eq "qemu")) {
                 # Configure the monitoring to automize the creation of the 'pb' snapshot
-                $ENV{'PBVMOPT'} .= "-serial mon:telnet::$vmmonport->{$ENV{'PBPROJ'}},server,nowait ";
+                $ENV{'PBVMOPT'} .= " -serial mon:telnet::$vmmonport->{$ENV{'PBPROJ'}},server,nowait";
                 # In that case no snapshot call needed
-                $ENV{'PBVMOPT'} =~ s/-snapshot //;
+                $ENV{'PBVMOPT'} =~ s/ -snapshot//;
             }
         }