- Timestamp:
- May 10, 2012, 12:47:48 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified devel/pb-modules/lib/ProjectBuilder/Distribution.pm ¶
r1507 r1514 358 358 next if (! /$regexp/); 359 359 chomp(); 360 361 my $nextline; 362 # Support multi-lines deps for .deb 363 if ($pbos->{type} eq 'deb') { 364 while ($nextline = <DESC>) { 365 last unless $nextline =~ /^\s+(.+)$/o; 366 $_ .= $1; 367 } 368 } 369 360 370 # What we found with the regexp is the list of deps. 361 371 pb_log(2,"found deps: $_\n"); … … 373 383 s/\s+/ /g; 374 384 $deps .= " ".$_; 385 386 # Support multi-lines deps for .deb (fwup) 387 if (defined $nextline) { 388 $_ = $nextline; 389 redo; 390 } 375 391 } 376 392 close(DESC); … … 399 415 next if $p =~ /^\s*$/o; 400 416 if ($pbos->{'type'} eq "rpm") { 401 my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet" );417 my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet", 1); 402 418 next if ($res eq 0); 403 419 } elsif ($pbos->{'type'} eq "deb") { 404 my $res = pb_system("dpkg -L $p","","quiet" );420 my $res = pb_system("dpkg -L $p","","quiet", 1); 405 421 next if ($res eq 0); 406 422 } elsif ($pbos->{'type'} eq "ebuild") { … … 449 465 my $dest = shift; 450 466 451 if (-f $dest && -s $dest == 0) { 467 if (not -f $dest) { 468 pb_log(1, "Creating new file $dest"); 469 } elsif (-f $dest && -s $dest == 0) { 452 470 pb_log(1, "Overwriting empty file $dest"); 453 471 } elsif (-f $dest && compare("$src", $dest) == 0) { 454 472 pb_log(1, "Overwriting identical file $dest"); 455 } elsif (not -f $dest) {456 pb_log(1, "Creating new $dest");457 473 } else { 458 474 pb_log(0, "ERROR: destination file $dest exists and is different than source $src\n"); 475 pb_system("cat $dest","Dest..."); 476 pb_system("cat $ENV{PBTMP}/$bn","New..."); 477 pb_log("Returning...\n"); 459 478 return(0); 460 479 }
Note:
See TracChangeset
for help on using the changeset viewer.