Changeset 1851 in ProjectBuilder for devel

Timestamp:

Jan 28, 2014, 11:13:42 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix #128 by removing the initialization to STDOUT of the FD in pb_display_file and also improving pb_get_content to avoid to handle the last line

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Base.pm (modified) (4 diffs)
• pb/bin/pb (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -163 +163 @@
     pb_log(0,"NOT OK but non blocking\n") if ($res != 0);
     pb_log(0,"OK\n") if ($res == 0);
-    pb_display_file("$ENV{'PBTMP'}/system.$$.log",undef,$verbose) if ((-f "$ENV{'PBTMP'}/system.$$.log") and (defined $verbose) and ($verbose =~ /verbose/));
+    pb_display_file("$ENV{'PBTMP'}/system.$$.log",undef,$verbose) if ((-f "$ENV{'PBTMP'}/system.$$.log") and ($verbose =~ /verbose/));
     return($res) 
 }
@@ -301 +301 @@
 
 my $file=shift;
-my $desc=shift || \*STDOUT;
+my $desc=shift;
 my $prefix=shift;
 
@@ -309 +309 @@
 if ((defined $prefix) and ($prefix =~ "_")) {
     $prefix =~ s/verbose_//;
-    $cnt =~ s/\n/\n$prefix/g;
+    $cnt =~ s/\n[^\z]/\n$prefix/g;
 } else {
     $prefix = "";
 }
-print "$prefix$cnt\n";
-print $desc "$prefix$cnt\n" if (defined $desc);
+print "$prefix$cnt";
+print $desc "$prefix$cnt" if (defined $desc);
 }
 
@@ -322 +322 @@
 
 =cut
-
 sub pb_get_content {
 
 my $file=shift;
 
-my $bkp = $/;
-undef $/;
 open(R,$file) || die "Unable to open $file: $!";
+local $/;
 my $content=<R>;
 close(R);
-chomp($content);
-$/ = $bkp;
 return($content);
 }

devel/pb/bin/pb

@@ -1509 +1509 @@
     pb_mkdir_p($tmpd) if (defined $pbparallel);
 
-    # Do it here as this doesn't work in // mode as itdies if it fails
+    # Do it here as this doesn't work in // mode as it dies if it fails
     if ($pbos->{'type'} eq "rpm") {
         foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {