Changeset 567

Show
Ignore:
Timestamp:
09/30/08 12:10:32 (2 years ago)
Author:
bruno
Message:

- Pass verbose level to pb launched in virtual environments/machines
- Fix a bug on package nae detection on Ubuntu (dpkg-deb output different from the Debian one !)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • 0.9.4/pb/bin/pb

    r566 r567  
    867867                chomp(); 
    868868                my $tmp = $_; 
    869                 next if ($tmp !~ /^dpkg-deb.:/); 
     869                next if ($tmp !~ /^dpkg-deb.*:/); 
    870870                $tmp =~ s|.*../(.*)_(.*).deb.*|$1|; 
    871871                $made="$made $tmp.dsc $tmp.tar.gz $tmp"."_*.deb $tmp"."_*.changes"; 
     
    14951495print SCRIPT "# Build\n"; 
    14961496print SCRIPT "echo Building packages on $vtype...\n"; 
    1497 print SCRIPT "pb -p $ENV{'PBPROJ'} build2pkg $p\n"; 
     1497 
     1498# Transmit the verbosity level to the virtual env/mach. 
     1499my $verbose = ""; 
     1500my $i = 0;                          # minimal debug level 
     1501while ($i lt $pbdebug) { 
     1502    $verbose .= "-v "; 
     1503    $i++; 
     1504
     1505# Quiet if asked to be so on the original system 
     1506$verbose = "-q" if ($pbdebug eq -1); 
     1507print SCRIPT "pb $verbose -p $ENV{'PBPROJ'} build2pkg $p\n"; 
    14981508close(SCRIPT); 
    14991509chmod 0755,"$ENV{'PBDESTDIR'}/pbscript"; 
  • devel/pb/bin/pb

    r566 r567  
    867867                chomp(); 
    868868                my $tmp = $_; 
    869                 next if ($tmp !~ /^dpkg-deb.:/); 
     869                next if ($tmp !~ /^dpkg-deb.*:/); 
    870870                $tmp =~ s|.*../(.*)_(.*).deb.*|$1|; 
    871871                $made="$made $tmp.dsc $tmp.tar.gz $tmp"."_*.deb $tmp"."_*.changes"; 
     
    14951495print SCRIPT "# Build\n"; 
    14961496print SCRIPT "echo Building packages on $vtype...\n"; 
    1497 print SCRIPT "pb -p $ENV{'PBPROJ'} build2pkg $p\n"; 
     1497 
     1498# Transmit the verbosity level to the virtual env/mach. 
     1499my $verbose = ""; 
     1500my $i = 0;                          # minimal debug level 
     1501while ($i lt $pbdebug) { 
     1502    $verbose .= "-v "; 
     1503    $i++; 
     1504
     1505# Quiet if asked to be so on the original system 
     1506$verbose = "-q" if ($pbdebug eq -1); 
     1507print SCRIPT "pb $verbose -p $ENV{'PBPROJ'} build2pkg $p\n"; 
    14981508close(SCRIPT); 
    14991509chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";