Changeset 1098 in ProjectBuilder

Timestamp:

Oct 25, 2010, 1:02:03 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Improve display of RPMS and SRPMS packages generated to allow easy cut and paste.
• Fix #69 by doing recursion in pb_list_bfiles to handle new Debian 3.0 format with subdirs

File:

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

devel/pb/bin/pb

@@ -1146 +1146 @@
         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");
-        }
+        }
+        my $rpms ="";
+        my $srpms ="";
+        foreach my $f (split(/ /,$made)) {
+            $rpms .= "$ENV{'PBBUILDDIR'}/$f " if ($f =~ /^RPMS\//);
+            $srpms .= "$ENV{'PBBUILDDIR'}/$f " if ($f =~ /^SRPMS\//);
+        }
+        pb_log(0,"SRPM packages generated: $srpms\n");
+        pb_log(0,"RPM packages generated: $rpms\n");
     } elsif ($dtype eq "deb") {
         my $made2 = "";
@@ -3012 +3018 @@
 foreach my $f (readdir(BDIR)) {
     next if ($f =~ /^\./);
+    if (-d $f) {
+        # Recurse for directories (Debian 3.0 format e.g.)
+        pb_list_bfiles($f,$pbpkg,$bfiles,$pkgfiles,$supfiles);
+        next;
+    }
     $bfiles->{$f} = "$dir/$f";
     $bfiles->{$f} =~ s~$ENV{'PBROOTDIR'}~~;