Changeset 572


Ignore:
Timestamp:
Oct 2, 2008, 6:08:24 PM (12 years ago)
Author:
Bruno Cornec
Message:

Fix a bug where src.rpm packages were not delivered up to the ftp server

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r567 r572  
    844844            open(LOG,"$ENV{'PBTMP'}/system.log") || die "Unable to open $ENV{'PBTMP'}/system.log";
    845845            while (<LOG>) {
    846                 chomp();
     846                chomp($_);
    847847                next if ($_ !~ /^Wrote:/);
    848848                s|.*/([S]*RPMS.*)|$1|;
    849                 $made="$made $_";
     849                $made .=" $_";
    850850            }
    851851            close(LOG);
     
    943943        if (-f "/usr/bin/rpmlint") {
    944944            pb_system("rpmlint $made","Checking validity of rpms with rpmlint","verbose");
     945        } else {
     946            pb_log(0,"rpm packages generated: $made\n");
    945947        }
    946948    } elsif ($dtype eq "deb") {
     949        my $made2 = "";
    947950        if (-f "/usr/bin/lintian") {
    948             my $made2 = "";
    949951            foreach my $f (split(/ /,$made)) {
    950952                $made2 .= "$f " if ($f =~ /\.changes$/);
    951953            }
    952954            pb_system("lintian $made2","Checking validity of debs with lintian","verbose");
     955        } else {
     956            pb_log(0,"deb packages generated: $made2\n");
    953957        }
    954958    } else {
    955         pb_log(0, "No check done for $dtype yet");
     959        pb_log(0,"No check done for $dtype yet\n");
     960        pb_log(0,"Packages generated: $made\n");
    956961    }
    957962
     
    12621267            my $j = basename($p);
    12631268            pb_system("$cpcmd $cp2target/\'$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Package recovery of $j in $cp2target");
    1264             $made="$made $odir/$over/$j" if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
     1269            $made="$made $odir/$over/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
    12651270        }
    12661271        print KEEP "$made\n";
Note: See TracChangeset for help on using the changeset viewer.