Changeset 572 in ProjectBuilder

Timestamp:

Oct 2, 2008, 6:08:24 PM (16 years ago)

Author:

Bruno Cornec

Message:

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

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -844 +844 @@
             open(LOG,"$ENV{'PBTMP'}/system.log") || die "Unable to open $ENV{'PBTMP'}/system.log";
             while (<LOG>) {
-                chomp();
+                chomp($_);
                 next if ($_ !~ /^Wrote:/);
                 s|.*/([S]*RPMS.*)|$1|;
-                $made="$made $_";
+                $made .=" $_";
             }
             close(LOG);
@@ -943 +943 @@
         if (-f "/usr/bin/rpmlint") {
             pb_system("rpmlint $made","Checking validity of rpms with rpmlint","verbose");
+        } else {
+            pb_log(0,"rpm packages generated: $made\n");
         }
     } elsif ($dtype eq "deb") {
+        my $made2 = "";
         if (-f "/usr/bin/lintian") {
-            my $made2 = "";
             foreach my $f (split(/ /,$made)) {
                 $made2 .= "$f " if ($f =~ /\.changes$/);
             }
             pb_system("lintian $made2","Checking validity of debs with lintian","verbose");
+        } else {
+            pb_log(0,"deb packages generated: $made2\n");
         }
     } else {
-        pb_log(0, "No check done for $dtype yet");
+        pb_log(0,"No check done for $dtype yet\n");
+        pb_log(0,"Packages generated: $made\n");
     }
 
@@ -1262 +1267 @@
             my $j = basename($p);
             pb_system("$cpcmd $cp2target/\'$p\' $ENV{'PBBUILDDIR'}/$odir/$over 2> /dev/null","Package recovery of $j in $cp2target");
-            $made="$made $odir/$over/$j" if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
+            $made="$made $odir/$over/$j"; # if (($dtype ne "rpm") || ($j !~ /.src.rpm$/));
         }
         print KEEP "$made\n";