Changeset 117 in ProjectBuilder

Timestamp:

Sep 7, 2007, 7:25:22 PM (17 years ago)

Author:

Bruno Cornec

Message:

Better src printing

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -405 +405 @@
             # $src = "$src $ENV{'PBDESTDIR'}/pbscript"
         }
-        print $LOG "$cmt: $src\n" if ($debug >= 0);
         push @src, $src;
     }
+    $src = join(' ',@src);
+    print $LOG "$cmt: $src\n" if ($debug >= 0);
     my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
     my $mac = "$sshlogin->{$ENV{'PBPROJ'}}\@$sshhost->{$ENV{'PBPROJ'}}";
@@ -421 +422 @@
     }
     $port = $sshport->{$ENV{'PBPROJ'}};
-    $src = join(' ',@src);
     pb_system("ssh -q -p $port $mac \"mkdir -p $tdir ; cd $tdir ; rm -f $src\"","Preparing $tdir on $mac");
     pb_system("scp -p -P $port $src $mac:$tdir","$cmt delivery in $tdir on $mac");

devel/pb/lib/ProjectBuilder/Base.pm

@@ -189 +189 @@
 
 print "$cmt... ";
-system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log");
+#system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log");
+system("$cmd");
 if ($? == -1) {
     print "failed to execute ($cmd) : $!\n";
@@ -208 +209 @@
 my $file=shift;
 
-open(FILE,"$file") || die "Unable to open $file";
+return if (not -f $file);
+open(FILE,"$file");
 while (<FILE>) {
     print $_;