Changeset 540 in ProjectBuilder for devel/pb/bin

Timestamp:

Sep 15, 2008, 1:11:19 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fix #32 for RPMS based packages

File:

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

devel/pb/bin/pb

@@ -541 +541 @@
         $pb{'rev'} = $pbrev;
         $pb{'ver'} = $pbver;
+        $pb{'pkg'} = $pbpkg;
         $pb{'date'} = $pbdate;
         $pb{'defpkgdir'} = $defpkgdir;
@@ -560 +561 @@
 
             # We need to compute the real name of the package
-            my $pbpkgreal = pb_cms_get_real_pkg($pbpkg,$pb{'dtype'});
-            $pb{'pkg'} = $pbpkgreal;
+            my $pbrealpkg = pb_cms_get_real_pkg($pbpkg,$pb{'dtype'});
+            $pb{'realpkg'} = $pbrealpkg;
 
             # Filter build files from the less precise up to the most with overloading
@@ -783 +784 @@
                 }
             }
-            $made="$made RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm SRPMS/$pbpkg-$pbver-$pbtag$pbsuf.src.rpm";
+            # Get the name of the generated packages
+            open(LOG,"$ENV{'PBTMP'}/system.log") || die "Unable to open $ENV{'PBTMP'}/system.log";
+            while (<LOG>) {
+                chomp();
+                next if ($_ !~ /^Wrote:/);
+                s|.*/([S]*RPMS.*)|$1|;
+                $made="$made $_";
+            }
+
             if (-f "/usr/bin/rpmlint") {
                 pb_system("rpmlint $made","Checking validity of rpms with rpmlint","verbose");