- Timestamp:
- May 12, 2012, 2:26:43 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r1523 r1524 435 435 my $deps2 = ""; 436 436 # Avoid to install what is already there 437 delete $ENV{COLUMNS}; 437 438 foreach my $p (split(/\s+/,$deps)) { 438 439 next if $p =~ /^\s*$/o; … … 440 441 my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet", 1); 441 442 next if ($res eq 0); 443 pb_log(1, "INFO: missing dependency $p\n"); 442 444 } elsif ($pbos->{'type'} eq "deb") { 443 445 my $res = pb_system("dpkg -L $p","","quiet", 1); … … 449 451 } 450 452 next if $ok; 453 pb_log(1, "INFO: missing dependency $p\n"); 451 454 } elsif ($pbos->{'type'} eq "ebuild") { 452 455 } else { … … 495 498 496 499 if (not -f $dest) { 497 pb_log(1, " Creating new file $dest");500 pb_log(1, "INFO: Creating new file $dest\n"); 498 501 } elsif (-f $dest && -s $dest == 0) { 499 pb_log(1, " Overwriting empty file $dest");502 pb_log(1, "INFO: Overwriting empty file $dest\n"); 500 503 } elsif (-f $dest && compare("$src", $dest) == 0) { 501 pb_log(1, " Overwriting identical file $dest");504 pb_log(1, "INFO: Overwriting identical file $dest\n"); 502 505 } else { 503 506 pb_log(0, "ERROR: destination file $dest exists and is different than source $src\n"); 504 pb_system("cat $dest"," Dest...");505 pb_system("cat $src"," New...");506 pb_log(" Returning...\n");507 pb_system("cat $dest","INFO: Dest...\n"); 508 pb_system("cat $src","INFO: New...\n"); 509 pb_log("INFO: Returning...\n"); 507 510 return(0); 508 511 }
Note:
See TracChangeset
for help on using the changeset viewer.